[clitk-commits-list] Clitk branch master updated. v1.2.0-604-g9548105

[root]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Clitk".

The branch, master has been updated
       via  9548105324e0d1e8d440a1e1d83faf37ebcf1c08 (commit)
      from  77226d6d36de538558c046abb93dd6bc8c8b6964 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=9548105324e0d1e8d440a1e1d83faf37ebcf1c08

commit 9548105324e0d1e8d440a1e1d83faf37ebcf1c08
Author: Vivien Delmon <vivien.delmon at creatis.insa-lyon.fr>
Date:   Wed Dec 14 14:18:40 2011 +0100

    Adapt CMakeLists to include it from other projects

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75f52c4..4cd0dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,20 @@ if(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 PROJECT(clitk)
-SET(CLITK_SOURCE_DIR ${PROJECT_SOURCE_DIR})
+IF(NOT DEFINED CLITK_SOURCE_DIR)
+  SET(CLITK_SOURCE_DIR ${PROJECT_SOURCE_DIR})
+ENDIF(NOT DEFINED CLITK_SOURCE_DIR)
 #=========================================================
 
 #=========================================================
-INCLUDE(cmake/common.cmake)
-INCLUDE(cmake/dependencies.cmake)
-INCLUDE(cmake/build_opt.cmake)
+INCLUDE(${CLITK_SOURCE_DIR}/cmake/common.cmake)
+INCLUDE(${CLITK_SOURCE_DIR}/cmake/dependencies.cmake)
+INCLUDE(${CLITK_SOURCE_DIR}/cmake/build_opt.cmake)
 #=========================================================
 #=========================================================
 
 # Select what is compiled
-ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(segmentation)
-ADD_SUBDIRECTORY(registration)
+ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/common ${PROJECT_BINARY_DIR}/common)
+ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools)
+ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/segmentation ${PROJECT_BINARY_DIR}/segmentation)
+ADD_SUBDIRECTORY(${CLITK_SOURCE_DIR}/registration ${PROJECT_BINARY_DIR}/registration)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Clitk