CMake 2.6 compatibility

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb741f913a4ec364185111f0cef2d692eab2240..57d53a3de11f554ca5109f1fd07bcc3fb3d09a62 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,15 @@
-#cmake_minimum_required(VERSION 2.4)
+#
+# 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 

diff --git a/kernel/cmake/BBTKAddDefinitions.cmake b/kernel/cmake/BBTKAddDefinitions.cmake
index e017c876d65663b1367075d98a712faaf1923fc2..4ea0c7010a488b29bdb42b6c31746bf9b63e05b7 100644 (file)
--- a/kernel/cmake/BBTKAddDefinitions.cmake
+++ b/kernel/cmake/BBTKAddDefinitions.cmake
@@ -1,9 +1,8 @@
 # Set C preprocessor definitions
-ADD_DEF_WITH_VAL(BBTK_SHARE_REL_PATH "\"${BBTK_SHARE_REL_PATH}\"")
-ADD_DEF_WITH_VAL(BBTK_DOC_REL_PATH "\"${BBTK_DOC_REL_PATH}\"")
-ADD_DEF_WITH_VAL(BBTK_BBS_REL_PATH "\"${BBTK_BBS_REL_PATH}\"")
-#ADD_DEF_WITH_VAL(BBTK_RSC_REL_PATH "\"${BBTK_RSC_REL_PATH}\"")
-ADD_DEF_WITH_VAL(BBTK_DATA_REL_PATH "\"${BBTK_DATA_REL_PATH}\"")
+ADD_DEF_WITH_VAL(BBTK_SHARE_REL_PATH "${BBTK_SHARE_REL_PATH}")
+ADD_DEF_WITH_VAL(BBTK_DOC_REL_PATH "${BBTK_DOC_REL_PATH}")
+ADD_DEF_WITH_VAL(BBTK_BBS_REL_PATH "${BBTK_BBS_REL_PATH}")
+ADD_DEF_WITH_VAL(BBTK_DATA_REL_PATH "${BBTK_DATA_REL_PATH}")
 #-----------------------------------------------------------------------------
 # messages compilation options 
 IF (BBTK_COMPILE_MESSAGES) 

diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index 6d51cf8afe2f2c2f31097936b06ac325fe59d9fa..9ccdebd4bc23f70eebf84fc18a4fefc2bca4aebd 100755 (executable)
--- a/kernel/doc/CMakeLists.txt
+++ b/kernel/doc/CMakeLists.txt
@@ -25,7 +25,6 @@ ELSE(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_GUIDES_HTML)
   MACRO(BBTK_BUILD_HTML_DOC_FROM_LATEX SOURCE)
   ENDMACRO(BBTK_BUILD_HTML_DOC_FROM_LATEX)
 ENDIF(BUILD_BBTK_DOC AND BUILD_BBTK_DOC_GUIDES_HTML)
-ENDIF(BUILD_BBTK_DOC_GUIDES_PDF)
 #-----------------------------------------------------------------------------
 
 

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 763fcb501bcdc6fe8a3e7505d1594865c82f9c96..208ad9dfeec119ce22102f10a9bdbd24b572537c 100644 (file)
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/13 14:46:43 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2008/11/17 10:00:24 $
+  Version:   $Revision: 1.29 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -499,10 +499,12 @@ namespace bbtk
                             <<std::endl);
          }
        if ((caller==0) ||
-           ((caller!=0) && 
-            (caller->GetBlackBoxTo() != to))&&
-           (!bbGetUpdateTransferedToParent())&&
-           (!to->bbGetExecuting()))
+           ( (caller!=0) && 
+             (caller->GetBlackBoxTo() != to)&&
+             (!bbGetUpdateTransferedToParent())&&
+             (!to->bbGetExecuting()) 
+             )
+           )
          {
            bbtkDebugMessage("process",3,
                             "   ... Transfering update order to parent"

diff --git a/kernel/src/cmake/bbtkConfigure.h.in b/kernel/src/cmake/bbtkConfigure.h.in
index 465d77d665bf317abdb4767a2bb88177d0529137..440835b1209c67b62153c9ecbeebf5dcac2608dd 100644 (file)
--- a/kernel/src/cmake/bbtkConfigure.h.in
+++ b/kernel/src/cmake/bbtkConfigure.h.in
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigure.h.in,v $
   Language:  C++
-  Date:      $Date: 2008/02/01 12:45:58 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/11/17 10:00:27 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -89,7 +89,8 @@
 #define BBTK_MAJOR_VERSION @BBTK_MAJOR_VERSION@
 #define BBTK_MINOR_VERSION @BBTK_MINOR_VERSION@
 #define BBTK_BUILD_VERSION @BBTK_BUILD_VERSION@
-#define BBTK_VERSION "@BBTK_VERSION@"
+#define BBTK_VERSION @BBTK_VERSION@
+#define BBTK_VERSION_STRING "@BBTK_VERSION@"
 #endif
 
 #endif