From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Thu, 18 Jul 2013 15:10:58 +0000 (+0200)
Subject: 2042		Feature	 		bbpConfigurator
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1748e90d1ea0278fb63f33b5d3af75633cbc8997;p=bbtk.git

2042		Feature	 		bbpConfigurator
---

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 2528960..080c02f 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -316,27 +316,30 @@ ENDIF(CHCON_LIBRARIES)
 
   IF (WIN32)
     MAKE_DLL_PATH()
- #   SET(command00 Path=c:/creatis/dlls__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
- #   STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
- #   SET(SETPATH set ${command0} &&)
-
-  ADD_CUSTOM_COMMAND( 
+    ADD_CUSTOM_COMMAND( 
 	 TARGET  bb${BBTK_PACKAGE_NAME} POST_BUILD
-#       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && $(OutDir)/bbpConfigurator.exe ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-       COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+         COMMAND  set "Path=${crea_DIR}/bin/\;"${DLL_PATH} && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
     ) 
   ELSE(WIN32)
     SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-##    ADD_CUSTOM_TARGET( bb${BBTK_PACKAGE_NAME}.bbp ALL
-####    COMMAND export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBPCONFIGURATOR}  ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-##      COMMAND  ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
-##    ) 
-
-  ADD_CUSTOM_COMMAND( 
-	 TARGET  bb${BBTK_PACKAGE_NAME} POST_BUILD
-         COMMAND  ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
+    ADD_CUSTOM_COMMAND( 
+         TARGET  bb${BBTK_PACKAGE_NAME} POST_BUILD
+         COMMAND  ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/  ${BBTK_PACKAGE_NAME}  ${BBTK_BBS_BUILD_PATH}/
     ) 
+  ENDIF(WIN32)
 
-	
+  SET(OUTPUT_FILE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbp)
+  IF(WIN32)
+   INSTALL(
+     FILES ${OUTPUT_FILE}
+#    DESTINATION ${BBTK_BBS_INSTALL_PATH}
+     DESTINATION ${BBTK_BBS_REL_PATH}
+    )
+   ELSE(WIN32)
+     INSTALL(
+       FILES ${OUTPUT_FILE}
+       DESTINATION ${BBTK_BBS_INSTALL_PATH}
+#      DESTINATION ${BBTK_BBS_REL_PATH}
+     )
   ENDIF(WIN32)
 
diff --git a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
index 91d4eae..342bbb2 100644
--- a/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
+++ b/kernel/cmake/BBTKCreatePackageIncludeScript.cmake
@@ -148,19 +148,6 @@ MACRO(BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT    BBTK_PACKAGE_NAME    BBTK_PACKAGE_BB
 ##      "#-- EOF ----------------------------------\n"
 ##    )
 
- IF(WIN32)
-  INSTALL(
-    FILES ${OUTPUT_FILE}
-#    DESTINATION ${BBTK_BBS_INSTALL_PATH}
-    DESTINATION ${BBTK_BBS_REL_PATH}
-    )
-ELSE(WIN32)
-  INSTALL(
-    FILES ${OUTPUT_FILE}
-    DESTINATION ${BBTK_BBS_INSTALL_PATH}
-#   DESTINATION ${BBTK_BBS_REL_PATH}
-    )
-ENDIF(WIN32)