Summary: before git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cedd0387f244f3e2352a949ec9cc04067e1b85e0..22a885b805efd0258e443d56a6112ae4c9a43dbc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,10 @@
 #      FORCE)
 #  endif()
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.13..3.26.3)
 set(PACKAGE_NAME "imach")
 SET(IMACH_VERSION_MAJOR 0)
-SET(IMACH_VERSION_MINOR 99s6)
+SET(IMACH_VERSION_MINOR 99s7)
 SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
@@ -29,7 +30,6 @@ SET(@COPYRIGHT@ "Copyright (C)  2002-2015 EUROREVES-Institut de longevite-Japan
 #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")
 
 # #PROJECT(IMaCh${IMACH_VERSION_MAJOR})
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
 PROJECT (imach)
 
 
@@ -126,34 +126,41 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSIO
 #SET(CPACK_PACKAGE_EXECUTABLES "IMaCh" "IMaCh")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IMaCh program estimates Health Expectancies from Cross-longitudinal surveys.")
 #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/imach-desc.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description")
 set(CPACK_RPM_PACKAGE_URL "http://euroreves.ined.fr/imach")
 IF(UNIX)
   SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
   SET(CPACK_RPM_PACKAGE_GROUP "Applications/Sciences")
   SET(CPACK_RPM_PACKAGE_REQUIRES "gnuplot >= 5.0, cmake >= 2.8")
-  SET(CPACK_GENERATOR "TXZ")
-  SET(CPACK_SOURCE_GENERATOR "TXZ")
-  SET(CPACK_SOURCE_TBZ2 "OFF")
-  SET(CPACK_SOURCE_TGZ "ON")
-  SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-src")
-  SET(CPACK_SOURCE_TXZ "ON")
-  SET(CPACK_SOURCE_TZ "ON")
-  SET(CPACK_SOURCE_ZIP "OFF")
+  set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
+  #SET(CPACK_GENERATOR "TXZ")
+  # SET(CPACK_GENERATOR RPM)
+  # SET(CPACK_SOURCE_GENERATOR "TXZ")
+  # SET(CPACK_SOURCE_TBZ2 "OFF")
+  # SET(CPACK_SOURCE_TGZ "ON")
+#non  SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-src")
+  # SET(CPACK_SOURCE_TXZ "ON")
+  # SET(CPACK_SOURCE_TZ "ON")
+  # SET(CPACK_SOURCE_ZIP "OFF")
   #SET(CPACK_RPM_PREFIX "/usr/local")
   # SET(CPACK_RPM_PACKAGE_PREFIX "/usr/local")
    SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
   # SET(CMAKE_INSTALL_PREFIX "/usr/local")
-  set(CPACK_RPM_PACKAGE_RELOCATABLE True)
+  set(CPACK_RPM_PACKAGE_RELOCATABLE "ON")
   # This a .spec Changelog not an Emacs ChangeLog that you get with C-x v a (vc-update-change-log)
   # * Mon May 20 2019  Brouard Nicolas  <brouard@brouard.name>
   # ${CMAKE_CURRENT_SOURCE_DIR}/specchangelog")
-  set(CPACK_RPM_CHANGELOG_FILE "${PROJECT_SOURCE_DIR}/src/Changelog")
+  set(CPACK_RPM_CHANGELOG_FILE "${PROJECT_SOURCE_DIR}/src/ChangeLog")
   SET(CPACK_BINARY_RPM "ON")
-# NEW  set(CPACK_RPM_COMPONENT_INSTALL ON)
-  SET(CPACK_RPM_PACKAGE_SOURCES "ON")
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
-  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.src")
+ # set(CPACK_RPM_COMPONENT_INSTALL ON)
+#non2  SET(CPACK_RPM_PACKAGE_SOURCES "ON")
+  #set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
+##  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
+##  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}.src.rpm")
+  set(CPACK_GENERATOR RPM)
+  set(CPACK_SOURCE_GENERATOR RPM)
+  set(CPACK_RPM_DEBUGINFOPACKAGE ON)
+  include(CPack)  # added
 ENDIF(UNIX)
 
 IF(WIN32 AND NOT UNIX)
@@ -171,7 +178,7 @@ ELSE(WIN32 AND NOT UNIX)
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
 #SET(CPACK_PACKAGE_EXECUTABLES "IMaCh" "IMaCh")
-INCLUDE(CPack)
+##INCLUDE(CPack)
 
   # set (CMAKE_GENERATOR_TOOLSET "v120_xp" CACHE STRING "BasePlatform toolset" FORCE)
   # ADD_DEFINITIONS(-D_USING_V110_SDK71_)