diff --git a/lefdef/CMakeLists.txt b/lefdef/CMakeLists.txt index ece775b3..9e9d4bbf 100644 --- a/lefdef/CMakeLists.txt +++ b/lefdef/CMakeLists.txt @@ -4,6 +4,7 @@ project(LEFDEF) cmake_minimum_required(VERSION 2.8.9) + set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/lefdef/src/def/def/CMakeLists.txt b/lefdef/src/def/def/CMakeLists.txt index a7399406..227ff104 100644 --- a/lefdef/src/def/def/CMakeLists.txt +++ b/lefdef/src/def/def/CMakeLists.txt @@ -78,12 +78,12 @@ ) set ( DefParserGrammar ${LEFDEF_SOURCE_DIR}/src/def/def/def.y ) - add_custom_command ( MAIN_DEPENDENCY ${DefParserGrammar} - COMMAND ${BISON_EXECUTABLE} - ARGS -v -p defyy -d ${DefParserGrammar} -o def.tab.cpp - COMMAND mv - ARGS def.tab.hpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.h - OUTPUT def.tab.cpp + add_custom_command ( OUTPUT def.tab.cpp + DEPENDS ${DefParserGrammar} + COMMAND ${BISON_EXECUTABLE} -v -p defyy -d ${DefParserGrammar} -o def.tab.cpp + COMMAND mv def.tab.hpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.h + #COMMAND mv def.tab.cpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.cpp + COMMENT "Generating DEF parser (bison)" ) set_source_files_properties ( def.tab.cpp GENERATED ) diff --git a/lefdef/src/def/defzlib/CMakeLists.txt b/lefdef/src/def/defzlib/CMakeLists.txt index 16904e7b..63d1d268 100644 --- a/lefdef/src/def/defzlib/CMakeLists.txt +++ b/lefdef/src/def/defzlib/CMakeLists.txt @@ -11,6 +11,7 @@ ) add_library ( defzlib ${cpps} ) + target_link_libraries ( defzlib def ) set_target_properties ( defzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS defzlib DESTINATION lib${LIB_SUFFIX} ) diff --git a/lefdef/src/lef/lef/CMakeLists.txt b/lefdef/src/lef/lef/CMakeLists.txt index 6ce435ae..e347cf03 100644 --- a/lefdef/src/lef/lef/CMakeLists.txt +++ b/lefdef/src/lef/lef/CMakeLists.txt @@ -29,8 +29,8 @@ lefwWriterCalls.hpp ) - set ( cpps crypt.cpp - lef.tab.cpp + set ( cpps lef.tab.cpp + crypt.cpp lef_keywords.cpp lefiArray.cpp lefiCrossTalk.cpp @@ -55,17 +55,17 @@ ) set ( LefParserGrammar ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.y ) - add_custom_command ( MAIN_DEPENDENCY ${LefParserGrammar} - COMMAND ${BISON_EXECUTABLE} - ARGS -v -p lefyy -d ${LefParserGrammar} -o lef.tab.cpp - COMMAND mv - ARGS lef.tab.hpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.h - OUTPUT lef.tab.cpp - ) - set_source_files_properties ( lef.tab.cpp GENERATED ) add_library ( lef ${cpps} ) set_target_properties ( lef PROPERTIES VERSION 5.8 SOVERSION 5 ) + add_custom_command ( OUTPUT lef.tab.cpp + DEPENDS ${LefParserGrammar} + COMMAND ${BISON_EXECUTABLE} -v -p lefyy -d ${LefParserGrammar} -o lef.tab.cpp + COMMAND mv lef.tab.hpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.h + #COMMAND mv lef.tab.cpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.cpp + COMMENT "Generating LEF parser (bison)" + ) + set_source_files_properties ( lef.tab.cpp GENERATED ) install ( TARGETS lef DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} DESTINATION include/lefdef ) diff --git a/lefdef/src/lef/lefzlib/CMakeLists.txt b/lefdef/src/lef/lefzlib/CMakeLists.txt index 9615d6bf..3028f876 100644 --- a/lefdef/src/lef/lefzlib/CMakeLists.txt +++ b/lefdef/src/lef/lefzlib/CMakeLists.txt @@ -11,6 +11,7 @@ ) add_library ( lefzlib ${cpps} ) + target_link_libraries ( lefzlib lef ) set_target_properties ( lefzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS lefzlib DESTINATION lib${LIB_SUFFIX} )