From 188f3a59821f031cb451848c43eb82426b045643 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 12 Feb 2013 10:32:27 +0100 Subject: [PATCH] Bug #1913 Error generation NSIS installeurs with CPACK --- CMakeLists.txt | 1 + cmake/CREAMacro_InstallLibraryForCMake.cmake | 3 ++- install/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca43033..c317c3b 100644 --- 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 8474320..21877db 100644 --- 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 f003414..7b4e92f 100644 --- 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}) -- 2.47.1