From: Eduardo Davila Date: Mon, 12 Oct 2009 18:34:01 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d64fc38049195a33ea8d61d49bc0e6bee3146ff3;hp=3740f9d018b889284096c525eb3cb23cdb6e84a8;p=crea_ThirdParty_dlls.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b7a783..28108bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/README.txt b/README.txt index 79c44f1..a818d32 100644 --- a/README.txt +++ b/README.txt @@ -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 diff --git a/instalL2/CMakeLists.txt b/instalL2/CMakeLists.txt index 6f86ff9..48b2e77 100644 --- a/instalL2/CMakeLists.txt +++ b/instalL2/CMakeLists.txt @@ -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 "