From 24e6d3d5d040c30878c7cbaf45db9bf001985713 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Mon, 17 Nov 2008 10:00:18 +0000
Subject: [PATCH] CMake 2.6 compatibility

---
 CMakeLists.txt                        | 13 ++++++++++++-
 kernel/cmake/BBTKAddDefinitions.cmake |  9 ++++-----
 kernel/doc/CMakeLists.txt             |  1 -
 kernel/src/bbtkWxBlackBox.cxx         | 14 ++++++++------
 kernel/src/cmake/bbtkConfigure.h.in   |  7 ++++---
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb741f..57d53a3 100644
--- 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 e017c87..4ea0c70 100644
--- 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 6d51cf8..9ccdebd 100755
--- 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 763fcb5..208ad9d 100644
--- 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 465d77d..440835b 100644
--- 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
-- 
2.45.1