From 6d762b1b6df5b3eabfabeca992572659fceb4f9f Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Wed, 10 Nov 2010 15:22:57 +0000 Subject: [PATCH] change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY --- CMakeLists.txt | 14 +++++++------- appli/CMakeLists.txt | 16 ++++++++-------- src/CMakeLists.txt | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 951ea8c..45c9c98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ SET(LIBNAME creaImageIO) ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src ) -SUBDIRS(src) +ADD_SUBDIRECTORY(src) OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON) @@ -108,17 +108,17 @@ IF (BUILD_CREA_PACS) ENDIF(BUILD_CREA_PACS) # -SUBDIRS(appli) -SUBDIRS(bbtk) -SUBDIRS(tests) +ADD_SUBDIRECTORY(appli) +ADD_SUBDIRECTORY(bbtk) +ADD_SUBDIRECTORY(tests) IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4) - SUBDIRS(win32) + ADD_SUBDIRECTORY(win32) endif() IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8) - SUBDIRS(win64) + ADD_SUBDIRECTORY(win64) endif() -SUBDIRS(install) +ADD_SUBDIRECTORY(install) ENABLE_TESTING() diff --git a/appli/CMakeLists.txt b/appli/CMakeLists.txt index d10f989..289e7a2 100644 --- a/appli/CMakeLists.txt +++ b/appli/CMakeLists.txt @@ -1,24 +1,24 @@ IF(!USE_INSTALL_APP) - SUBDIRS(gimmick) - SUBDIRS(TestGimmickReaderDialog) + ADD_SUBDIRECTORY(gimmick) + ADD_SUBDIRECTORY(TestGimmickReaderDialog) ENDIF(!USE_INSTALL_APP) if(USE_WXWIDGETS) IF(!USE_INSTALL_APP) - SUBDIRS(wxGimmick) + ADD_SUBDIRECTORY(wxGimmick) ENDIF(!USE_INSTALL_APP) - SUBDIRS(TestWxGimmickReaderDialog) - SUBDIRS(TestWxSimpleView) + ADD_SUBDIRECTORY(TestWxGimmickReaderDialog) + ADD_SUBDIRECTORY(TestWxSimpleView) ENDIF(USE_WXWIDGETS) IF(USE_QT4) - SUBDIRS(TestQtGimmick) + ADD_SUBDIRECTORY(TestQtGimmick) ENDIF(USE_QT4) - #SUBDIRS(TestWxGimmickReaderDialogJava) + #ADD_SUBDIRECTORY(TestWxGimmickReaderDialogJava) #LSE (BUILD_V2) - # SUBDIRS(TestWxGimmickDialog) + # ADD_SUBDIRECTORY(TestWxGimmickDialog) #ENDIF (BUILD_V2) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fdc5e1e..064b4ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -323,7 +323,7 @@ CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR}) OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF) IF(BUILD_DOXYGEN_DOC) - SUBDIRS(doxygen) + ADD_SUBDIRECTORY(doxygen) ENDIF(BUILD_DOXYGEN_DOC) INCLUDE_DIRECTORIES( -- 2.47.1