This commit is contained in:
James Cherry 2019-11-17 09:51:53 -07:00
commit ca969c0e8f
2 changed files with 7 additions and 5 deletions

1
.gitignore vendored
View File

@ -22,7 +22,6 @@ Makefile
/util/StaConfig.hh /util/StaConfig.hh
# /app/ # /app/
/app/TclInitVar.cc
/app/sta /app/sta
/app/sta.exe /app/sta.exe
/app/sta.dSYM /app/sta.dSYM

View File

@ -61,10 +61,12 @@ message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
################################################################ ################################################################
set(STA_WRAP ${CMAKE_CURRENT_BINARY_DIR}/StaApp_wrap.cc) set(STA_WRAP ${CMAKE_CURRENT_BINARY_DIR}/StaApp_wrap.cc)
set(STA_TCL_INIT ${CMAKE_CURRENT_BINARY_DIR}/StaTclInitVar.cc)
set(STA_SOURCE set(STA_SOURCE
app/StaMain.cc app/StaMain.cc
app/TclInitVar.cc ${STA_TCL_INIT}
${STA_WRAP}
dcalc/ArcDelayCalc.cc dcalc/ArcDelayCalc.cc
dcalc/ArnoldiDelayCalc.cc dcalc/ArnoldiDelayCalc.cc
@ -644,11 +646,11 @@ add_custom_command(OUTPUT ${STA_WRAP}
################################################################ ################################################################
# TCL files included as part of the executable are shoved into TclInitVar.cc. # TCL files included as part of the executable are shoved into StaTclInitVar.cc.
# These files are encoded and shipped as part of the executable # These files are encoded and shipped as part of the executable
# so that they do not have to be installed on the client host. # so that they do not have to be installed on the client host.
add_custom_command(OUTPUT ${STA_HOME}/app/TclInitVar.cc add_custom_command(OUTPUT ${STA_TCL_INIT}
COMMAND etc/TclEncode.tcl app/TclInitVar.cc tcl_inits ${STA_TCL_FILES} COMMAND etc/TclEncode.tcl ${STA_TCL_INIT} tcl_inits ${STA_TCL_FILES}
WORKING_DIRECTORY ${STA_HOME} WORKING_DIRECTORY ${STA_HOME}
DEPENDS ${STA_TCL_FILES} etc/TclEncode.tcl DEPENDS ${STA_TCL_FILES} etc/TclEncode.tcl
) )
@ -705,6 +707,7 @@ target_link_libraries(sta
${TCL_LIB} ${TCL_LIB}
${CUDD_LIB} ${CUDD_LIB}
) )
if (ZLIB_FOUND) if (ZLIB_FOUND)
target_link_libraries(sta ${ZLIB_LIBRARIES}) target_link_libraries(sta ${ZLIB_LIBRARIES})
endif() endif()