]> Creatis software - creaTools.git/commitdiff
#2472 CreaTools Bug New Normal Add in the windows Instaler creaVtk library
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 28 Oct 2014 20:35:02 +0000 (21:35 +0100)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 28 Oct 2014 20:35:02 +0000 (21:35 +0100)
CMakeLists.txt
install/CMakeLists.txt

index 44e15d896153e88b602d8eab166ec98c11dc3592..2be06facaf30a6bbdf441e024ca5fd30baee8e17 100644 (file)
@@ -43,7 +43,7 @@ ENDIF(BUILD_TESTING)
 #==================================
 # The project version
 SET(PROJECT_MAJOR_VERSION 2)
-SET(PROJECT_MINOR_VERSION 3)
+SET(PROJECT_MINOR_VERSION 4)
 SET(PROJECT_BUILD_VERSION 0)
 #==================================
 
index 9a5f4d9c5c21f109385b5fa373d25c3b2efe8046..23848edb02a3d87965469bc8bb91d80cf438cefd 100644 (file)
@@ -73,6 +73,7 @@ IF(WIN32 AND NOT UNIX)
   set  (CREA_BASE                                      crea)
   set  (CREA_BBTK                                      bbtk)
   set  (CREA_MARACASVISU                       creaMaracasVisu)
+  set  (CREA_VTK                                       creaVtk)
   set  (CREA_IMAGEIO                           creaImageIO)
   set  (CREA_CONTOURS                          creaContours)
   set  (CREA_ENVIRIONMENT                      creaEnvironment)
@@ -102,6 +103,7 @@ IF(WIN32 AND NOT UNIX)
        SET(CREA_BASE_DIRBIN                    "$INSTDIR\\\\${CREA_BASE}\\\\bin")
        SET(CREA_BBTK_DIRBIN                    "$INSTDIR\\\\${CREA_BBTK}\\\\bin")
        SET(CREA_MARACASVISU_DIRBIN     "$INSTDIR\\\\${CREA_MARACASVISU}\\\\bin")
+       SET(CREA_VTK_DIRBIN                     "$INSTDIR\\\\${CREA_VTK}\\\\bin")
        SET(CREA_IMAGEIO_DIRBIN                 "$INSTDIR\\\\${CREA_IMAGEIO}\\\\bin")
        SET(CREA_CONTOURS_DIRBIN                "$INSTDIR\\\\${CREA_CONTOURS}\\\\bin")
        SET(CREA_ENVIRIONMENT_DIRBIN    "$INSTDIR\\\\${CREA_ENVIRIONMENT}\\\\bin")
@@ -228,8 +230,9 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/bin/                                                        DESTINATION bin  )
 INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data/                                                  DESTINATION bin/data  )
 INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BASE}/                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_BBTK}/                    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
-INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/                         DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_MARACASVISU}/             DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_VTK}/                             DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
+INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_IMAGEIO}/                         DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_CONTOURS}/                DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_ENVIRIONMENT}/    DESTINATION ${CREATOOLS_DESTINATION_PATH}  )
 INSTALL(DIRECTORY ${CREATOOLS_SOURCE_PATH}\\\\${CREA_RECALAGE}/                DESTINATION ${CREATOOLS_DESTINATION_PATH}  )