From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Tue, 20 Oct 2009 09:13:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=crea_ThirdParty_Libraries.git;a=commitdiff_plain;h=7fabaf0dd1c84636a145ae8cb49d9f290046520a

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a938d1a..31b72ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,15 +14,15 @@ SET(PROJECT_BUILD_VERSION 0)
 #==================================
 # Find crea
 SET(CREA_VERBOSE_CMAKE TRUE)
-FIND_PACKAGE(crea REQUIRED)
-IF (crea_FOUND)
-  INCLUDE(${crea_USE_FILE})
-ENDIF(crea_FOUND)
+#FIND_PACKAGE(crea REQUIRED)
+#IF (crea_FOUND)
+#  INCLUDE(${crea_USE_FILE})
+#ENDIF(crea_FOUND)
 #==================================
 
 #==================================
 # Do not allow to build inside the source tree
-CREA_PREVENT_IN_SOURCE_BUILD()
+#CREA_PREVENT_IN_SOURCE_BUILD()
 #==================================
 
 #==================================
@@ -30,19 +30,19 @@ CREA_PREVENT_IN_SOURCE_BUILD()
 # Note : Set USE_CREA to ON
 #  if you need to LINK against crea
 #  (and not only use its macros)
-SET(USE_CREA      OFF)
-SET(USE_GDCM      OFF)
-SET(USE_GDCM_VTK  OFF)
-SET(USE_GDCM2     OFF)
-SET(USE_WXWIDGETS OFF)
-SET(USE_KWWIDGETS OFF)
-SET(USE_VTK       OFF)
-SET(USE_ITK       OFF)
-SET(USE_BOOST     OFF)
-SET(USE_DOXYGEN   OFF)
-SET(USE_LATEX     OFF)
-SET(USE_TTH       OFF)
-CREA_FIND_AND_USE_LIBRARIES()
+#SET(USE_CREA      OFF)
+#SET(USE_GDCM      OFF)
+#SET(USE_GDCM_VTK  OFF)
+#SET(USE_GDCM2     OFF)
+#SET(USE_WXWIDGETS OFF)
+#SET(USE_KWWIDGETS OFF)
+#SET(USE_VTK       OFF)
+#SET(USE_ITK       OFF)
+#SET(USE_BOOST     OFF)
+#SET(USE_DOXYGEN   OFF)
+#SET(USE_LATEX     OFF)
+#SET(USE_TTH       OFF)
+#CREA_FIND_AND_USE_LIBRARIES()
 #==================================
 
 #==================================
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 73a0cd5..80fb2e3 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -15,8 +15,8 @@
 
 INCLUDE(InstallRequiredSystemLibraries)
 
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "crea_ThirdParty_Libraries - CREATIS-LRMN")
-SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS")
+SET(CPACK_PACKAGE_VENDOR "CREATIS")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
@@ -28,9 +28,9 @@ SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 
 
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\crea_ThirdParty_Libraries-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
   IF(WIN32)
-    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea_ThirdParty_Libraries)
+    SET(CMAKE_INSTALL_PREFIX C:/CreaTools/${PROJECT_NAME})
   ENDIF(WIN32)
 
 
@@ -42,16 +42,16 @@ IF(WIN32 AND NOT UNIX)
   # sure there is at least one set of four (4) backlasshes.
 #EED  SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp")
 #  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe")
-  SET(CPACK_NSIS_DISPLAY_NAME "crea_ThirdParty_Libraries")
-  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/crea_ThirdParty_Libraries")
-  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/crea_ThirdParty_Libraries")
+  SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}")
+  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}")
   SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
   SET(CPACK_NSIS_MODIFY_PATH OFF)
 
 
   set  (CREA_BOOST_LYBRARY	boost-1.40.0)
-  set  (CREA_GDCM_LYBRARY	gdcm110909 )
-  set  (CREA_ITK_LYBRARY	itk-3.14.0 )
+  set  (CREA_GDCM_LYBRARY	gdcm13 )
+  set  (CREA_ITK_LYBRARY	itk-3.16.0 )
   set  (CREA_QT_LYBRARY		Qt4.5.2 )
   set  (CREA_VTK_LYBRARY	vtk-5.4.2 )  
   set  (CREA_WXWIN_LYBRARY	wxWidgets-2.8.10)