riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Fix missing libraries problems (seen on Cygwin)." 

This reverts commit 881e97bbd3.
This commit is contained in:
Robert Taylor 2023-07-15 02:56:48 +00:00
parent c0c0e873c2
commit edafd1d200
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -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 )

2
hurricane/src/configuration/CMakeLists.txt
View File

@ -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}"

2
hurricane/src/viewer/CMakeLists.txt
View File

@ -150,7 +150,7 @@
${UTILITIES_LIBRARY}
${LIBXML2_LIBRARIES}
${QtX_LIBRARIES}
${Python_LIBRARIES}
)
add_library( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pyCpps} )

2
lefdef/src/def/defzlib/CMakeLists.txt
View File

@ -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} )

2
lefdef/src/lef/lefzlib/CMakeLists.txt
View File

@ -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} )