jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compliance with cmake 3.0 (Debian 9.2). Corrects all warnings.

This commit is contained in:
Jean-Paul Chaput 2017-12-02 14:30:05 +01:00
parent 89dfc2179c
commit 2b9c929f80
31 changed files with 70 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
anabatic/CMakeLists.txt
View File

@ -3,6 +3,8 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(ANABATIC)
set(ignoreVariables "${BUILD_DOC}")
option(BUILD_DOC "Build the documentation (doxygen)" OFF)
option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF)
@ -13,7 +15,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost()
setup_qt()

2
bootstrap/CMakeLists.txt
View File

@ -5,6 +5,8 @@
cmake_minimum_required(VERSION 2.4.0)
set(ignoreVariables "${BUILD_DOC}")
add_subdirectory(cmake_modules)
list(INSERT CMAKE_MODULE_PATH 0 "${Bootstrap_SOURCE_DIR}/cmake_modules/")

9
bootstrap/builder/Builder.py
View File

@ -179,7 +179,7 @@ class Builder:
if self._openmp: command += [ "-D", "WITH_OPENMP:STRING=TRUE" ]
command += [ "-D", "CMAKE_BUILD_TYPE:STRING=%s" % self.buildMode
, "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared
#, "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared
, "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir
, "-D", "CMAKE_INSTALL_DIR:STRING=%s" % cmakeInstallDir
#, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules
@ -197,14 +197,13 @@ class Builder:
if os.path.isfile ( cmakeCache ): os.unlink ( cmakeCache )
command += [ "-D", "BUILD_DOC:STRING=%s" % self._enableDoc
, "-D", "CHECK_DATABASE:STRING=%s" % self._checkDatabase
, "-D", "CHECK_DETERMINISM:STRING=%s" % self._checkDeterminism
, "-D", "CMAKE_VERBOSE_MAKEFILE:STRING=%s" % self._verboseMakefile
, "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir
, "-D", "CMAKE_INSTALL_DIR:STRING=%s" % cmakeInstallDir
]
if self.libSuffix:
command += [ "-D", "LIB_SUFFIX:STRING=%s" % self.libSuffix ]
if self.libSuffix: command += [ "-D", "LIB_SUFFIX:STRING=%s" % self.libSuffix ]
if self._checkDatabase == 'ON': command += [ "-D", "CHECK_DATABASE:STRING=ON" ]
if self._checkDeterminism == 'ON': command += [ "-D", "CHECK_DETERMINISM:STRING=ON" ]
command += [ toolSourceDir ]
self._execute ( command, "Second CMake failed" )

18
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -75,6 +75,7 @@
#
# Adds -Wall to the C/C++ flags.
#
set(BUILD_SHARED_LIBS "ON")
#set(DEBUG_FLAGS "-g -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
set(DEBUG_FLAGS "-g")
if(CYGWIN)
@ -174,23 +175,6 @@
endmacro(hurricane_check_libraries)
#
# Perform some tweaks on shared/static linking.
#
macro(set_lib_link_mode)
if(NOT BUILD_SHARED_LIBS)
# check for qmake
find_program(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake PATHS
/opt/qt4-static-4.3.2/bin
NO_DEFAULT_PATH
)
message(STATUS "Building static libraries.")
else(NOT BUILD_SHARED_LIBS)
message(STATUS "Building dynamic libraries.")
endif(NOT BUILD_SHARED_LIBS)
endmacro(set_lib_link_mode)
#
# Find Boost, checking different versions.
#

1
coloquinte/CMakeLists.txt
View File

@ -13,7 +13,6 @@
setup_qt()
set_cmake_policies()
set_lib_link_mode()
setup_boost()
find_package(Libexecinfo REQUIRED)

1
crlcore/CMakeLists.txt
View File

@ -15,7 +15,6 @@
set_cmake_policies()
check_distribution()
set_lib_link_mode()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
setup_boost(program_options python regex wave)
setup_qt()

67
crlcore/src/ccore/CMakeLists.txt
View File

@ -183,19 +183,16 @@
set ( VstParserScannerCpp ${VstParserBinaryDir}/VstParserScanner.cpp )
set ( VstParserGrammarCpp ${VstParserBinaryDir}/VstParserGrammar.cpp )
add_subdirectory ( alliance )
add_custom_target ( VstParser echo "Creating VST parser" )
add_custom_command ( SOURCE ${VstParserScanner}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PVST -o${VstParserScannerCpp} ${VstParserScanner}
TARGET VstParser
OUTPUTS ${VstParserScannerCpp}
add_custom_command ( MAIN_DEPENDENCY ${VstParserScanner}
OUTPUT ${VstParserScannerCpp}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PVST -o${VstParserScannerCpp} ${VstParserScanner}
)
add_custom_command ( SOURCE ${VstParserGrammar}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p VST -y ${VstParserGrammar} -o ${VstParserGrammarCpp}
TARGET VstParser
DEPENDS ${VstParserScannerCpp}
OUTPUTS ${VstParserGrammarCpp}
add_custom_command ( MAIN_DEPENDENCY ${VstParserGrammar}
DEPENDS ${VstParserScannerCpp}
OUTPUT ${VstParserGrammarCpp}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p VST -y ${VstParserGrammar} -o ${VstParserGrammarCpp}
)
include_directories ( ${VstParserBinaryDir} )
set ( vst_parser_cpps ${VstParserScannerCpp}
@ -212,19 +209,16 @@
set ( IocParserScannerCpp ${IocParserBinaryDir}/IocParserScanner.cpp )
set ( IocParserGrammarCpp ${IocParserBinaryDir}/IocParserGrammar.cpp )
add_subdirectory ( ioc )
add_custom_target ( IocParser echo "Creating IOC parser" )
add_custom_command ( SOURCE ${IocParserScanner}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PIoc -o${IocParserScannerCpp} ${IocParserScanner}
TARGET IocParser
OUTPUTS ${IocParserScannerCpp}
add_custom_command ( MAIN_DEPENDENCY ${IocParserScanner}
OUTPUT ${IocParserScannerCpp}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PIoc -o${IocParserScannerCpp} ${IocParserScanner}
)
add_custom_command ( SOURCE ${IocParserGrammar}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p Ioc -y ${IocParserGrammar} -o ${IocParserGrammarCpp}
TARGET IocParser
DEPENDS ${IocParserScannerCpp}
OUTPUTS ${IocParserGrammarCpp}
add_custom_command ( MAIN_DEPENDENCY ${IocParserGrammar}
DEPENDS ${IocParserScannerCpp}
OUTPUT ${IocParserGrammarCpp}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p Ioc -y ${IocParserGrammar} -o ${IocParserGrammarCpp}
)
include_directories ( ${IocParserBinaryDir} )
set ( ioc_parser_cpps ${IocParserScannerCpp}
@ -269,20 +263,19 @@
set ( AcmSigdaParserScannerCpp ${AcmSigdaParserBinaryDir}/AcmSigdaParserScanner.cpp )
set ( AcmSigdaParserGrammarCpp ${AcmSigdaParserBinaryDir}/AcmSigdaParserGrammar.cpp )
add_subdirectory ( acmsigda )
add_custom_target ( AcmSigdaParser echo "Creating ACM/SIGDA parser" )
add_custom_command ( SOURCE ${AcmSigdaParserScanner}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PAcmSigda_ -o${AcmSigdaParserScannerCpp} ${AcmSigdaParserScanner}
TARGET AcmSigdaParser
OUTPUTS ${AcmSigdaParserScannerCpp}
add_custom_command ( MAIN_DEPENDENCY ${AcmSigdaParserScanner}
OUTPUT ${AcmSigdaParserScannerCpp}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PAcmSigda_ -o${AcmSigdaParserScannerCpp}
${AcmSigdaParserScanner}
)
add_custom_command ( SOURCE ${AcmSigdaParserGrammar}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p AcmSigda_ -y ${AcmSigdaParserGrammar} -o ${AcmSigdaParserGrammarCpp}
TARGET AcmSigdaParser
DEPENDS ${AcmSigdaParserScannerCpp}
crlcore/AcmSigda.h
OUTPUTS ${AcmSigdaParserGrammarCpp}
add_custom_command ( MAIN_DEPENDENCY ${AcmSigdaParserGrammar}
DEPENDS ${AcmSigdaParserScannerCpp}
crlcore/AcmSigda.h
OUTPUT ${AcmSigdaParserGrammarCpp}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p AcmSigda_ -y ${AcmSigdaParserGrammar}
-o ${AcmSigdaParserGrammarCpp}
)
include_directories ( ${AcmSigdaParserBinaryDir} )
set ( acmsigda_parser_cpps ${AcmSigdaParserScannerCpp}

4
cumulus/CMakeLists.txt
View File

@ -4,12 +4,14 @@
project(CUMULUS)
cmake_minimum_required(VERSION 2.4.0)
set(ignoreVariables "${BUILD_DOC}")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
find_package(PythonLibs 2 REQUIRED)

2
documentation/CMakeLists.txt
View File

@ -5,6 +5,8 @@
cmake_minimum_required(VERSION 2.4.0)
set(ignoreVariables "${LIB_SUFFIX}")
option(BUILD_DOC "Build the documentation (html+pdf)" OFF)
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")

1
documentation/examples/code/engine/smurf/CMakeLists.txt
View File

@ -11,7 +11,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options python regex)
setup_qt()

3
equinox/CMakeLists.txt
View File

@ -4,13 +4,14 @@
project(EQUINOX)
cmake_minimum_required(VERSION 2.8.9)
set(ignoreVariables "${BUILD_DOC}")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

1
etesian/CMakeLists.txt
View File

@ -13,7 +13,6 @@
setup_qt()
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options python regex)
find_package(PythonLibs 2 REQUIRED)

1
hurricane/CMakeLists.txt
View File

@ -13,7 +13,6 @@
list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options regex)
setup_qt()

42
hurricane/CMakeLists.txt.orig
View File

@ -1,42 +0,0 @@
# -*- mode: CMAKE explicit-buffer-name: "CMakeLists.txt<hurricane>" -*-
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(HURRICANE)
option(BUILD_DOC "Build the documentation (doxygen)" OFF)
cmake_minimum_required(VERSION 2.8.9)
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options regex)
setup_qt()
find_package(LibXml2 REQUIRED)
find_package(BZip2 REQUIRED)
find_package(BISON REQUIRED)
find_package(FLEX REQUIRED)
find_package(PythonLibs REQUIRED)
find_package(PythonSitePackages REQUIRED)
find_package(VLSISAPD REQUIRED)
find_package(Libexecinfo REQUIRED)
find_package(Libbfd)
add_subdirectory(src)
add_subdirectory(cmake_modules)
#add_subdirectory(tests)
if(BUILD_DOC)
find_package(Doxygen)
if(DOXYGEN_FOUND)
add_subdirectory(doc)
endif()
endif()
#enable_testing()
#add_test(HurricaneTest ${PROJECT_BINARY_DIR}/tests/htest)

1
ispd/CMakeLists.txt
View File

@ -10,7 +10,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
#setup_apple()
setup_boost(program_options filesystem python regex)

1
katabatic/CMakeLists.txt
View File

@ -13,7 +13,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

6
katabatic/doc/AutoSegments.dox
View File

@ -17,15 +17,15 @@
//! \typedef typedef GenericFilter<AutoSegment*> AutoSegmentFilter;
//! Shorthand for AutoSegment Hurricane Generic Filter
//! (filter with \c auto_ptr<> like support).
//! (filter with \c unique_ptr<> like support).
//! \typedef typedef GenericLocator<AutoSegment*> AutoSegmentLocator;
//! Shorthand for AutoSegment Hurricane Generic Locator
//! (locator with \c auto_ptr<> like support).
//! (locator with \c unique_ptr<> like support).
//! \typedef typedef GenericCollection<AutoSegment*> AutoSegments;
//! Shorthand for AutoSegment Hurricane Generic Collection
//! (collection with \c auto_ptr<> like support).
//! (collection with \c unique_ptr<> like support).
/*! \class AutoSegments_OnContact
* \brief All AutoSegment anchored on a Contact

3
katana/CMakeLists.txt
View File

@ -8,12 +8,13 @@
cmake_minimum_required(VERSION 2.8.9)
set(ignoreVariables "${BUILD_DOC}")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

1
kite/CMakeLists.txt
View File

@ -13,7 +13,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

3
knik/CMakeLists.txt
View File

@ -5,13 +5,14 @@
cmake_minimum_required(VERSION 2.8.9)
set(ignoreVariables "${BUILD_DOC}")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
print_cmake_module_path()
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

1
lefdef/CMakeLists.txt
View File

@ -12,7 +12,6 @@
print_cmake_module_path()
set_cmake_policies()
set_lib_link_mode()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
find_package(BISON REQUIRED)

5
lefdef/src/def/def/CMakeLists.txt
View File

@ -78,13 +78,12 @@
)
set ( DefParserGrammar ${LEFDEF_SOURCE_DIR}/src/def/def/def.y )
add_custom_command ( SOURCE ${DefParserGrammar}
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
TARGET DefParser
OUTPUTS def.tab.cpp
OUTPUT def.tab.cpp
)
set_source_files_properties ( def.tab.cpp GENERATED )

5
lefdef/src/lef/lef/CMakeLists.txt
View File

@ -55,13 +55,12 @@
)
set ( LefParserGrammar ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.y )
add_custom_command ( SOURCE ${LefParserGrammar}
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
TARGET LefParser
OUTPUTS lef.tab.cpp
OUTPUT lef.tab.cpp
)
set_source_files_properties ( lef.tab.cpp GENERATED )

1
mauka/CMakeLists.txt
View File

@ -11,7 +11,6 @@
print_cmake_module_path()
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem regex python)
setup_qt()

1
metis/CMakeLists.txt
View File

@ -11,7 +11,6 @@
print_cmake_module_path()
set_cmake_policies()
set_lib_link_mode()
setup_boost()
find_package(PythonLibs 2 REQUIRED)

1
nimbus/CMakeLists.txt
View File

@ -10,7 +10,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

3
solstice/CMakeLists.txt
View File

@ -4,13 +4,14 @@
project(SOLSTICE)
cmake_minimum_required(VERSION 2.8.9)
set(ignoreVariables "${BUILD_DOC}")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options filesystem python regex)
setup_qt()

1
stratus1/CMakeLists.txt
View File

@ -14,7 +14,6 @@
set_cmake_policies()
# The flaw is in UseLATEX.cmake.
cmake_policy(SET CMP0002 OLD)
set_lib_link_mode()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
find_package(PythonLibs 2 REQUIRED)

3
tutorial/CMakeLists.txt
View File

@ -7,12 +7,13 @@
cmake_minimum_required(VERSION 2.8.9)
set(ignoreVariables "${LIB_SUFFIX} ${BUILD_DOC}")
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_boost(program_options python)
setup_qt()

1
unicorn/CMakeLists.txt
View File

@ -10,7 +10,6 @@
setup_project_paths(CORIOLIS)
set_cmake_policies()
set_lib_link_mode()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
setup_boost(program_options python regex)
setup_qt()

21
vlsisapd/src/liberty/src/CMakeLists.txt
View File

@ -33,19 +33,16 @@ set ( LibertyParserGrammar ${VLSISAPD_SOURCE_DIR}/src/liberty/src/LibertyPars
set ( LibertyParserScannerCpp LibertyParserScanner.cpp )
set ( LibertyParserGrammarCpp LibertyParserGrammar.cpp )
add_custom_target ( LibertyParser echo "Creating Liberty parser" )
add_custom_command ( SOURCE ${LibertyParserScanner}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PLiberty_ -o${LibertyParserScannerCpp} ${LibertyParserScanner}
TARGET LibertyParser
OUTPUTS ${LibertyParserScannerCpp}
add_custom_command ( MAIN_DEPENDENCY ${LibertyParserScanner}
COMMAND ${FLEX_EXECUTABLE}
ARGS -PLiberty_ -o${LibertyParserScannerCpp} ${LibertyParserScanner}
OUTPUT ${LibertyParserScannerCpp}
)
add_custom_command ( SOURCE ${LibertyParserGrammar}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p Liberty_ -y ${LibertyParserGrammar} -o ${LibertyParserGrammarCpp}
TARGET LibertyParser
DEPENDS ${LibertyParserScannerCpp}
OUTPUTS ${LibertyParserGrammarCpp}
add_custom_command ( MAIN_DEPENDENCY ${LibertyParserGrammar}
DEPENDS ${LibertyParserScannerCpp}
COMMAND ${BISON_EXECUTABLE}
ARGS -d -v -p Liberty_ -y ${LibertyParserGrammar} -o ${LibertyParserGrammarCpp}
OUTPUT ${LibertyParserGrammarCpp}
)
set ( liberty_parser_cpps ${LibertyParserScannerCpp}
${LibertyParserGrammarCpp}