]> Creatis software - crea_ThirdParty_dlls.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 12 Oct 2009 18:34:01 +0000 (18:34 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 12 Oct 2009 18:34:01 +0000 (18:34 +0000)
CMakeLists.txt
README.txt
instalL2/CMakeLists.txt

index 3b7a7832b1dfd9d4cd6f929889552704f0ff68a5..28108bbf7c93be35df28b3e9e5cdbae80b3fcfb3 100644 (file)
@@ -1,5 +1,7 @@
 PROJECT(crea_ThirdParty_dlls)
 
+cmake_minimum_required(VERSION 2.6)
+
 SET(PROJECT_MAJOR_VERSION 3)
 SET(PROJECT_MINOR_VERSION 0)
 SET(PROJECT_BUILD_VERSION 0)
index 79c44f1b8ea51afed9ac31b7f1d742bb528ac314..a818d32f2a8fca2fbeccbb2c300aeec60dc5ab00 100644 (file)
@@ -16,4 +16,4 @@ Add the tth directory as this was added in previous releases.
 End
 
 
-(c) CREATIS-LRMN 2008
\ No newline at end of file
+(c) CREATIS 2009
\ No newline at end of file
index 6f86ff9fe56637816b4647c0e4f4c57490d1d254..48b2e773835a9872e005b58446c5676779bc49c4 100644 (file)
@@ -38,7 +38,7 @@ IF(WIN32 AND NOT UNIX)
   SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/crea_ThirdParty_dlls")
   SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/crea_ThirdParty_dlls")
   SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
+  SET(CPACK_NSIS_MODIFY_PATH OFF)
 ELSE(WIN32 AND NOT UNIX)
 #  SET(CPACK_STRIP_FILES "bin/bbi")
   SET(CPACK_SOURCE_STRIP_FILES "")
@@ -89,7 +89,8 @@ IF(WIN32)
 #EED-08oct2009 STRING(REGEX REPLACE "\\\\" "/" ENVPATH "$ENV{Path}")
 
        SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MikTex-2.7\\\\miktex\\\\bin")
-       SET(CREATOOLS_DIRS "${MIKTEX_INSTALL_DIR}")
+       SET(CREA_DLLS_DIR "$INSTDIR\\\\bin")
+       SET(CREATOOLS_DIRS ";${CREA_DLLS_DIR};${MIKTEX_INSTALL_DIR}")
        
        
        SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "