From edafd1d2009d0f7a63fa9401eee7fd732a1b0a8d Mon Sep 17 00:00:00 2001 From: Robert Taylor Date: Sat, 15 Jul 2023 02:56:48 +0000 Subject: [PATCH] Revert "Fix missing libraries problems (seen on Cygwin)." This reverts commit 881e97bbd3940065c51b5cb9a7a83d8a0d0df8f5. --- bootstrap/cmake_modules/FindBootstrap.cmake | 24 ++++++++++----------- hurricane/src/configuration/CMakeLists.txt | 2 -- hurricane/src/viewer/CMakeLists.txt | 2 +- lefdef/src/def/defzlib/CMakeLists.txt | 2 +- lefdef/src/lef/lefzlib/CMakeLists.txt | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index 2bcd02db..caf76dfe 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -86,17 +86,17 @@ set(ADDITIONAL_FLAGS "-D_GLIBCXX_USE_C99") set(CXX_STANDARD "gnu++17") else() - set(ADDITIONAL_FLAGS "-Wl,--no-undefined") + set(ADDTIONAL_FLAGS "") set(CXX_STANDARD "c++17") endif() -#set(CMAKE_C_FLAGS_DEBUG " -Wall -fsanitize=address ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) - set(CMAKE_C_FLAGS_DEBUG " -Wall ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) - set(CMAKE_C_FLAGS_RELEASE " -Wall -O2 ${ADDITIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) -#set(CMAKE_C_FLAGS_RELEASE " -Wall -fsanitize=address ${ADDITIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) -#set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE) - set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE) - set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -O2 ${ADDITIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) -#set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDITIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) +#set(CMAKE_C_FLAGS_DEBUG " -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) + set(CMAKE_C_FLAGS_DEBUG " -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) + set(CMAKE_C_FLAGS_RELEASE " -Wall -O2 ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) +#set(CMAKE_C_FLAGS_RELEASE " -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C Compiler Release options." FORCE) +#set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE) + set(CMAKE_CXX_FLAGS_DEBUG "-std=${CXX_STANDARD} -Wall ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C++ Compiler Debug options." FORCE) + set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -O2 ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) +#set(CMAKE_CXX_FLAGS_RELEASE "-std=${CXX_STANDARD} -Wall -fsanitize=address ${ADDTIONAL_FLAGS} -DNDEBUG" CACHE STRING "C++ Compiler Release options." FORCE) if ( NOT CMAKE_BUILD_TYPE ) @@ -427,7 +427,7 @@ endif() add_library( ${clib} ${pyCpps} ) set_target_properties( ${clib} PROPERTIES VERSION ${version} SOVERSION ${soversion}) -#target_compile_definitions( ${clib} PUBLIC Py_LIMITED_API=1) + #target_compile_definitions( ${clib} PUBLIC Py_LIMITED_API=1) target_link_libraries( ${clib} ${deplibs} ) install( TARGETS ${clib} DESTINATION lib${LIB_SUFFIX} ) target_link_options( ${clib} PRIVATE "LINKER:--unresolved-symbols=ignore-all") @@ -441,7 +441,7 @@ endif() PREFIX "" OUTPUT_NAME ${pymodule} ) -#target_compile_definitions( ${pytarget} PUBLIC Py_LIMITED_API=1) + #target_compile_definitions( ${pytarget} PUBLIC Py_LIMITED_API=1) target_link_libraries( ${pytarget} ${pyDeplibs} ) target_link_options( ${pytarget} PRIVATE "LINKER:--unresolved-symbols=ignore-all") @@ -466,7 +466,7 @@ endif() add_library( ${pymodule} MODULE ${pyCpps} ) set_target_properties( ${pymodule} PROPERTIES PREFIX "" ) target_link_libraries( ${pymodule} ${deplibs} ) -#target_compile_definitions( ${pymodule} PUBLIC Py_LIMITED_API=1) + # target_compile_definitions( ${pymodule} PUBLIC Py_LIMITED_API=1) install( TARGETS ${pymodule} DESTINATION ${Python_CORIOLISARCH} ) if( NOT ("${pyIncludes}" STREQUAL "None") ) diff --git a/hurricane/src/configuration/CMakeLists.txt b/hurricane/src/configuration/CMakeLists.txt index 3b88a9ba..4c941fbc 100644 --- a/hurricane/src/configuration/CMakeLists.txt +++ b/hurricane/src/configuration/CMakeLists.txt @@ -83,11 +83,9 @@ qtX_add_resources( RCC_SRCS Configuration.qrc ) add_library( configuration ${cpps} ${mocCpps} ${RCC_SRCS} ) - target_link_libraries( configuration ${QtX_LIBRARIES} ) set_target_properties( configuration PROPERTIES VERSION 1.0 SOVERSION 1 ) add_library( pytypemanager ${pyTypeCpps} ) - target_link_libraries( pytypemanager hurricane ${Python_LIBRARIES}) set_target_properties( pytypemanager PROPERTIES VERSION 1.0 SOVERSION 1 ) add_python_module3( "${pyCfgCpps}" diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt index 4cbc520c..7ab12e3e 100644 --- a/hurricane/src/viewer/CMakeLists.txt +++ b/hurricane/src/viewer/CMakeLists.txt @@ -150,7 +150,7 @@ ${UTILITIES_LIBRARY} ${LIBXML2_LIBRARIES} ${QtX_LIBRARIES} - ${Python_LIBRARIES} + ) add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} ) diff --git a/lefdef/src/def/defzlib/CMakeLists.txt b/lefdef/src/def/defzlib/CMakeLists.txt index e1f96319..bf160445 100644 --- a/lefdef/src/def/defzlib/CMakeLists.txt +++ b/lefdef/src/def/defzlib/CMakeLists.txt @@ -11,7 +11,7 @@ ) add_library ( defzlib ${cpps} ) - target_link_libraries ( defzlib def z ) +# target_link_libraries ( defzlib def z ) set_target_properties ( defzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS defzlib DESTINATION lib${LIB_SUFFIX} ) diff --git a/lefdef/src/lef/lefzlib/CMakeLists.txt b/lefdef/src/lef/lefzlib/CMakeLists.txt index 9fda26fa..99b8e34d 100644 --- a/lefdef/src/lef/lefzlib/CMakeLists.txt +++ b/lefdef/src/lef/lefzlib/CMakeLists.txt @@ -11,7 +11,7 @@ ) add_library ( lefzlib ${cpps} ) - target_link_libraries ( lefzlib lef z ) +# target_link_libraries ( lefzlib lef z ) set_target_properties ( lefzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS lefzlib DESTINATION lib${LIB_SUFFIX} )