Bug #1913

Error generation NSIS installeurs with CPACK

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca4303327a9a4463570299e703c664de0932c91f..c317c3b5623e048336e60cf8b99448f18a18e7c3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,6 +99,7 @@ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/glib-2.0/include/)
 #JCP UBUNTU
 
+
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(appli)

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 8474320fdcc3f2ae9947c8a94be9f7b0419f8c77..21877db79c9a9f705246591836db88c69c4ab58e 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -287,7 +287,8 @@ MACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME)
 # JPR 04 Mars 2011
   INSTALL( 
     FILES ${CILC_WORK_DIR}/Find${LIBRARY_NAME}.cmake
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules
+##EED12Fev2013    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules
+    DESTINATION share/cmake/Modules
     )
     
  

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index f003414a9a82210e78d87fa817dd2b974445f38d..7b4e92f773c2f029eda7a46c621537b7418d1364 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -85,8 +85,8 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 
 INCLUDE(InstallRequiredSystemLibraries)
 
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "crea - CREATIS-LRMN")
-SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "crea - 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 ${crea_MAJOR_VERSION})