From: guigues <guigues>
Date: Thu, 14 Feb 2008 12:39:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~212
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1a15ca3e697702e7a28d0ccf4300691810ca25d0;p=bbtk.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 366cbc4..675bd1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,20 +2,9 @@
 PROJECT(BBTK) 
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# BBTK version number
-SET(BBTK_MAJOR_VERSION 0)
-SET(BBTK_MINOR_VERSION 5)
-SET(BBTK_BUILD_VERSION 0)
-SET(BBTK_VERSION 
-  "${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
-# Now in bbtkConfigure.h file (cf. core/src)
-#ADD_DEFINITIONS( -DBBTK_VERSION=${BBTK_VERSION} )
-#-----------------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------
 # Set global configuration of the toolkit
-INCLUDE(cmake/BBTKGlobalConfiguration.cmake)
+INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -24,6 +13,6 @@ SUBDIRS(kernel)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# The "standard" packages 
+# The "core" packages 
 SUBDIRS(packages)
 #-----------------------------------------------------------------------------
diff --git a/kernel/cmake/BBTKRootCMakeLists.cmake b/kernel/cmake/BBTKRootCMakeLists.cmake
new file mode 100644
index 0000000..a3810ce
--- /dev/null
+++ b/kernel/cmake/BBTKRootCMakeLists.cmake
@@ -0,0 +1,26 @@
+#-----------------------------------------------------------------------------
+SET(BBTK_CMAKE_REL_PATH kernel/cmake)
+SET(BBTK_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${BBTK_CMAKE_REL_PATH})
+#-----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKVersion.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKMacros.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKKernelConfig.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKSetDeducedPaths.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKPreventInSourceBuild.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildAllOption.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKMarkAsAdvanced.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKFindLibraries.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKDefineOptions.cmake)
+#----------------------------------------------------------------------------
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKAddDefinitions.cmake)
+#----------------------------------------------------------------------------
diff --git a/kernel/cmake/BBTKVersion.cmake b/kernel/cmake/BBTKVersion.cmake
new file mode 100644
index 0000000..f09c105
--- /dev/null
+++ b/kernel/cmake/BBTKVersion.cmake
@@ -0,0 +1,10 @@
+#-----------------------------------------------------------------------------
+# BBTK version number
+SET(BBTK_MAJOR_VERSION 1)
+SET(BBTK_MINOR_VERSION 0)
+SET(BBTK_BUILD_VERSION 0)
+SET(BBTK_VERSION 
+  "${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
+# Now in bbtkConfigure.h file (cf. core/src)
+#ADD_DEFINITIONS( -DBBTK_VERSION=${BBTK_VERSION} )
+#-----------------------------------------------------------------------------
diff --git a/packages/void-bbtk-package.tgz b/packages/void-bbtk-package.tgz
deleted file mode 100644
index 06c1796..0000000
Binary files a/packages/void-bbtk-package.tgz and /dev/null differ