From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 22 Feb 2008 17:36:41 +0000 (+0000)
Subject: CPAKE in linux
X-Git-Tag: r0.6.1~158
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a86e449e78ba07cd05cb267efea47eef2c6ab51a;hp=6ea571ab3b7a539aaaca066db3941f5017920209;p=bbtk.git

CPAKE in linux
---

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index a1462c4..cfb63e7 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -57,7 +57,7 @@ ENDIF(WIN32)
 # from build tree root or install tree root
 # (different on win/lin)
 IF(WIN32)
-  SET(BBTK_SHARE_REL_PATH)
+  SET(BBTK_SHARE_REL_PATH / )
   SET(BBTK_DOC_REL_PATH doc)
   SET(BBTK_BBS_REL_PATH bbs)
   #  SET(BBTK_RSC_REL_PATH rsc)
diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index 4bc0911..c29805c 100755
--- a/kernel/doc/CMakeLists.txt
+++ b/kernel/doc/CMakeLists.txt
@@ -113,16 +113,16 @@ IF(BUILD_bbtk_DOC)
   # Recurse it bbtkWebSite dir
   SUBDIRS(bbtkWebSite)
 
-  
   INSTALL(
-    DIRECTORY  ${BBTK_BINARY_DIR}/doc 
-    DESTINATION  /
+    DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_DOC_REL_PATH}
+    DESTINATION  ${BBTK_SHARE_REL_PATH}
     )
 
   INSTALL(
-    DIRECTORY  ${BBTK_BINARY_DIR}/bbs 
-    DESTINATION  /
+    DIRECTORY  ${BBTK_BINARY_DIR}/${BBTK_BBS_REL_PATH}
+    DESTINATION  ${BBTK_SHARE_REL_PATH}
     )
+  
 
 ENDIF(BUILD_bbtk_DOC)
 #-----------------------------------------------------------------------------
diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index d780681..b1292ca 100644
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/21 09:37:23 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2008/02/22 17:36:42 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -48,7 +48,7 @@ namespace bbtk
     mInstall_path = mBin_path + mFile_separator + "..";
     // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
     mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH);
-    mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(doc);
+//EED    mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(doc);
     // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
     mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
     // The relative path to the doc folder (=BBTK_BBS_REL_PATH)