X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=0ca78e894d8c213732c5fa6ec64e66535e901972;hb=fea0c6ff7e209a7bb61bcc8176742e5f1a609443;hp=578aac7b27d620106730a6ab970f8a757ccc83d3;hpb=bc1cd198a9c1e740e324939e93b158afcb256809;p=bbtkGEditor.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 578aac7..0ca78e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # # Unless you are an experimented cmake user, # have a look at : -# http://www.creatis.insa-lyon.fr/creatools/GettingStarted_creaTools +# http://www.creatis.insa-lyon.fr/site/fr/CreatoosGettingStarted-v2.0.X # before starting. # # --------------------------------- @@ -37,24 +37,6 @@ IF (crea_FOUND) ENDIF(crea_FOUND) #================================== -#================================== -FIND_PACKAGE(creaMaracasVisu REQUIRED) -IF (creaMaracasVisu_FOUND) - INCLUDE(${creaMaracasVisu_USE_FILE}) -ENDIF(creaMaracasVisu_FOUND) -#================================== - - -#================================== -# Find and use the Black Box Toolkit -# Search BBTK -FIND_PACKAGE(BBTK REQUIRED) -MARK_AS_ADVANCED(BBTK_DIR) -# If bbtk found -IF(BBTK_FOUND) - INCLUDE(${BBTK_USE_FILE}) -ENDIF(BBTK_FOUND) -#================================== #================================== # Do not allow to build inside the source tree @@ -92,6 +74,26 @@ SET(USE_BOOST ON) CREA_FIND_AND_USE_LIBRARIES() #================================== + +#================================== +FIND_PACKAGE(creaMaracasVisu REQUIRED) +IF (creaMaracasVisu_FOUND) + INCLUDE(${creaMaracasVisu_USE_FILE}) +ENDIF(creaMaracasVisu_FOUND) +#================================== + +#================================== +# Find and use the Black Box Toolkit +# Search BBTK +FIND_PACKAGE(BBTK REQUIRED) +MARK_AS_ADVANCED(BBTK_DIR) +# If bbtk found +IF(BBTK_FOUND) + INCLUDE(${BBTK_USE_FILE}) +ENDIF(BBTK_FOUND) +#================================== + + #================================== # Where to put executables and libs SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) @@ -108,8 +110,7 @@ MARK_AS_ADVANCED( INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} - # // if the previous one is not enough : (JPRx) - # Add here the directories holding the .h you need + # USER! : Add here the directories holding the .h you need # ${PROJECT_SOURCE_DIR}/lib/_YOUR_OWN_LIBRARY_SOURCE_DIRECTORY_