ubuntu cmake 3.10 compatibility

This commit is contained in:
James Cherry 2020-01-25 14:20:23 -07:00
parent 5d8204bbd7
commit 5a35f0a8e6
1 changed files with 12 additions and 13 deletions

View File

@ -466,9 +466,6 @@ add_flex_bison_dependency(SdfLex SdfParser)
################################################################ ################################################################
# all hell breaks loose with cmake 3.16.2
#cmake_policy(SET CMP<0078> NEW)
#set(UseSWIG_TARGET_NAME_PREFERENCE STANDARD)
find_package(SWIG REQUIRED 3.0) find_package(SWIG REQUIRED 3.0)
include(UseSWIG) include(UseSWIG)
@ -477,16 +474,18 @@ set(STA_SWIG_FILE app/StaApp.i)
set_property(SOURCE ${STA_SWIG_FILE} set_property(SOURCE ${STA_SWIG_FILE}
PROPERTY CPLUSPLUS ON PROPERTY CPLUSPLUS ON
) )
set_property(SOURCE ${STA_SWIG_FILE} # Ubuntu 18.04 apt version is 3.10.2 that does not support the
PROPERTY COMPILE_OPTIONS -module sta -namespace -prefix sta # COMPILE_OPTIONS and INCLUDE_DIRECTORIES properties so cram
) # them into SWIG_FLAGS for the time being.
set_property(SOURCE ${STA_SWIG_FILE} set_property(SOURCE ${STA_SWIG_FILE}
PROPERTY INCLUDE_DIRECTORIES PROPERTY SWIG_FLAGS
${STA_HOME}/tcl -module sta
${STA_HOME}/sdf -namespace -prefix sta
${STA_HOME}/dcalc -I${STA_HOME}/tcl
${STA_HOME}/parasitics -I${STA_HOME}/sdf
${STA_HOME}/verilog -I${STA_HOME}/dcalc
-I${STA_HOME}/parasitics
-I${STA_HOME}/verilog
) )
swig_add_library(sta_swig swig_add_library(sta_swig