From edd85db787e36c156409e240e2bdda5b14f7df69 Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Thu, 11 Mar 2010 16:01:10 +0000 Subject: [PATCH] * All tools: - Change: Adaptation to cmake 2.8. No more "add_subdirectory()" when the sub directory doesn't hold a CMakeList.txt. For "add_definition()", set policy 00005 to NEW. - Change: Integrate IO extenal libraries. - Change: Small compatibilities between "size_t" and "unsigned int" under 64 bits. - Change: Temporarily disable Equinox/Solstice in unicorn. --- kite/CMakeLists.txt | 1 + kite/src/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt index fcd5deba..81b771bd 100644 --- a/kite/CMakeLists.txt +++ b/kite/CMakeLists.txt @@ -28,6 +28,7 @@ ENDIF(BUILD_DOC) FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options REQUIRED) FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(Boost 1.33.1 REQUIRED) +FIND_PACKAGE(IO REQUIRED) FIND_PACKAGE(LEFDEF REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED) FIND_PACKAGE(CORIOLIS REQUIRED) diff --git a/kite/src/CMakeLists.txt b/kite/src/CMakeLists.txt index 286c4331..b6cb4e8a 100644 --- a/kite/src/CMakeLists.txt +++ b/kite/src/CMakeLists.txt @@ -71,6 +71,8 @@ ${CORIOLIS_LIBRARIES} ${HURRICANE_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES} + ${CIF_LIBRARY} + ${AGDS_LIBRARY} ${QT_LIBRARIES} ${LEFDEF_LIBRARIES} ${OA_LIBRARIES} @@ -82,6 +84,8 @@ ${CORIOLIS_LIBRARIES} ${HURRICANE_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES} + ${CIF_LIBRARY} + ${AGDS_LIBRARY} ${QT_LIBRARIES} ${LEFDEF_LIBRARIES} ${OA_LIBRARIES}