From 0fbf1ecbcd33922c0e6441d40399e63a0e65b337 Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Thu, 11 Mar 2010 16:01:42 +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. --- ispd/CMakeLists.txt | 1 + ispd/src/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt index 857d1200..613c44b8 100644 --- a/ispd/CMakeLists.txt +++ b/ispd/CMakeLists.txt @@ -31,6 +31,7 @@ SET(QT_USE_QTXML "true") FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options REQUIRED) FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project +FIND_PACKAGE(IO REQUIRED) FIND_PACKAGE(LEFDEF REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED) FIND_PACKAGE(CORIOLIS REQUIRED) diff --git a/ispd/src/CMakeLists.txt b/ispd/src/CMakeLists.txt index ec915774..c26566a5 100644 --- a/ispd/src/CMakeLists.txt +++ b/ispd/src/CMakeLists.txt @@ -21,6 +21,8 @@ ${CORIOLIS_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_LIBRARIES} + ${AGDS_LIBRARY} + ${CIF_LIBRARY} ${OA_LIBRARIES} ${LEFDEF_LIBRARIES} ${QT_LIBRARIES}