change SUBDIRS (deprecate functionality) to ADD_SUBDIRECTORY

[bbtk.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57d53a3de11f554ca5109f1fd07bcc3fb3d09a62..2c928b8c88a891433a54ecd3e9f2debc5325dfbd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,37 @@
-#
-# Test CMake version
-#
+#-----------------------------------------------------------------------------
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
-
-# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
-IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-  CMAKE_POLICY(SET CMP0003 NEW)
-  CMAKE_POLICY(SET CMP0005 NEW)
-ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+#-----------------------------------------------------------------------------
 
-#if(COMMAND cmake_policy)
-  # UNCOMMENT the 3 lines 'cmake_policy(...
-  # If you are using cmake 2.6 
-  # We can test it automatically, no JP ?
-  #cmake_policy(SET CMP0000 OLD)
-  #cmake_policy(SET CMP0005 NEW)
-  #cmake_policy(SET CMP0003 NEW)
- #   endif(COMMAND cmake_policy)
+     if(COMMAND cmake_policy)
+       cmake_policy(SET CMP0003 NEW)
+       cmake_policy(SET CMP0005 NEW)
+       cmake_policy(SET CMP0011 NEW)             
+     endif(COMMAND cmake_policy)
 
 #-----------------------------------------------------------------------------
-PROJECT(BBTK) 
+PROJECT(bbtk) 
 #-----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
 # Set global configuration of the toolkit
-INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake)
+INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake NO_POLICY_SCOPE )
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # The toolkit kernel (bbtk lib; appli : bbi, bbfy; docs; ...)
-SUBDIRS(kernel)
+ADD_SUBDIRECTORY(kernel)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # The "core" packages 
-SUBDIRS(packages)
+ADD_SUBDIRECTORY(packages)
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# The samples
+#OPTION(BUILD_BBTK_SAMPLES "Build bbtk samples" OFF)
+#IF(BUILD_BBTK_SAMPLES)
+#  ADD_SUBDIRECTORY(samples)
+#ENDIF(BUILD_BBTK_SAMPLES)
 #-----------------------------------------------------------------------------