]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Tue, 13 May 2008 05:50:25 +0000 (05:50 +0000)
committerguigues <guigues>
Tue, 13 May 2008 05:50:25 +0000 (05:50 +0000)
kernel/cmake/BBTKConfigurePackage_src.cmake
kernel/doc/bbtkWebSite/CMakeLists.txt

index b6a16eba6e672b00559d2a2225c79fb4dfe4418b..d447c987e86afe8eca2ba8d702b650c3a2df1626 100644 (file)
@@ -78,17 +78,17 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   IF (WIN32)
-    set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
+    SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
     STRING(REPLACE "__RR__" "\;" command0 ${command00} )
-  ELSEIF(WIN32)
-    set(command0 " " )      
+    SET(SETPATH "set ${command0} &&")
+  ELSE(WIN32)
+    SET(SETPATH "")
   ENDIF(WIN32)
   
   ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
-    COMMAND 
-       set ${command0}  && 
-    ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    COMMAND
+    ${SETPATH} ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )
@@ -99,7 +99,7 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   
   
  #  IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}")
-  message ("EED Alert BBTKConfigurePackage_src  "  "IF NOT MATCHES" )
# message ("EED Alert BBTKConfigurePackage_src  "  "IF NOT MATCHES" )
   SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
       ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
       ${filename}
index b421d8b9bd0d8e927db1f4b0ea4f56bc6efe1863..cb2833445ab0969ccb12f8ab9ac4f6fe344a8a1f 100644 (file)
@@ -32,14 +32,19 @@ CONFIGURE_FILE(
   ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
   @ONLY
   )
-  
-  set(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
+
+IF (WIN32)
+  SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
   STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
+  SET(SETPATH "set ${command0} &&")
+ELSE (WIN32)
+  SET(SETPATH "")
+ENDIF (WIN32)
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${INDEX_OUTPUT}
   COMMAND 
-  set ${command0} && cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+  ${SETPATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
   DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
   )
 ADD_CUSTOM_TARGET(bbdoc_index ALL