Unsolved bug, add_definitions() doesn't work in Etesian CMakeLists.txt
* Bug: In Etesian CMakeLists.txt cannot get add_definitions() to work to enable/disable Coloquinte. As a workaroud, it's moved into the FindCOLOQUINTE.cmake itself. Cannot make any sense of it.
This commit is contained in:
parent
f434ea4faa
commit
e5f3f5d89a
|
@ -8,6 +8,7 @@
|
||||||
cmake_minimum_required(VERSION 2.8.9)
|
cmake_minimum_required(VERSION 2.8.9)
|
||||||
|
|
||||||
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
|
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
|
||||||
|
find_package(COLOQUINTE)
|
||||||
find_package(Bootstrap REQUIRED)
|
find_package(Bootstrap REQUIRED)
|
||||||
setup_project_paths(CORIOLIS)
|
setup_project_paths(CORIOLIS)
|
||||||
setup_project_paths(COLOQUINTE)
|
setup_project_paths(COLOQUINTE)
|
||||||
|
@ -20,7 +21,6 @@
|
||||||
find_package(LibXml2 REQUIRED)
|
find_package(LibXml2 REQUIRED)
|
||||||
find_package(PythonLibs REQUIRED)
|
find_package(PythonLibs REQUIRED)
|
||||||
find_package(PythonSitePackages REQUIRED)
|
find_package(PythonSitePackages REQUIRED)
|
||||||
find_package(COLOQUINTE )
|
|
||||||
find_package(VLSISAPD REQUIRED)
|
find_package(VLSISAPD REQUIRED)
|
||||||
find_package(LEFDEF REQUIRED)
|
find_package(LEFDEF REQUIRED)
|
||||||
find_package(HURRICANE REQUIRED)
|
find_package(HURRICANE REQUIRED)
|
||||||
|
@ -30,10 +30,6 @@
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
add_subdirectory(cmake_modules)
|
add_subdirectory(cmake_modules)
|
||||||
|
|
||||||
if(COLOQUINTE_FOUND)
|
|
||||||
add_definitions(-DHAVE_COLOQUINTE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_DOC)
|
if(BUILD_DOC)
|
||||||
find_package(Doxygen)
|
find_package(Doxygen)
|
||||||
# if(DOXYGEN_FOUND)
|
# if(DOXYGEN_FOUND)
|
||||||
|
|
Loading…
Reference in New Issue