--- imach/CMakeLists.txt 2020/02/22 21:01:54 1.24 +++ imach/CMakeLists.txt 2022/08/03 17:31:34 1.34 @@ -8,11 +8,11 @@ # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE) set(PACKAGE_NAME "imach") SET(IMACH_VERSION_MAJOR 0) -SET(IMACH_VERSION_MINOR 99r20) +SET(IMACH_VERSION_MINOR 99r31) SET(IMACH_VERSION_PATCH 0) SET(IMACH_VERSION_NOTE "") SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) -SET(@APPNAME@ IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) +SET(@APPNAME@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) SET(@NOTINNOREG@ ) SET(@NOREG@ ) SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup) @@ -24,12 +24,12 @@ SET(@LICENSEFILE@ Copying) SET(@PACKAGE@ imach) SET(@DICTLANG@ en) SET(@VERMAJOR@ ) -SET(@COPYRIGHT@ "Copyright (C) 2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) 2013-2016- Intel Software 2015-2018") +SET(@COPYRIGHT@ "Copyright (C) 2002-2015 EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) 2013-2016- Intel Software 2015-2018 2000-2022 INED") #SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}.${IMACH_VERSION_PATCH}) #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}") # #PROJECT(IMaCh${IMACH_VERSION_MAJOR}) -PROJECT (IMaCh) +PROJECT (imach) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) @@ -55,8 +55,8 @@ CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/te set (imach_SRCS ./src/imach.c) SET( CMAKE_VERBOSE_MAKEFILE on ) #SET(CMAKE_INSTALL_PREFIX "/usr/local") -ADD_EXECUTABLE (IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS}) -INSTALL(TARGETS IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries ) +ADD_EXECUTABLE (imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS}) +INSTALL(TARGETS imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries ) #INSTALL(TARGETS imach DESTINATION bin COMPONENT binaries ) ADD_SUBDIRECTORY(html) ADD_SUBDIRECTORY(tests) @@ -68,7 +68,7 @@ ADD_SUBDIRECTORY(tests) #endif() if(UNIX) # set(CMAKE_CXX_COMPILER "gcc") - target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m) + target_link_libraries(imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m) set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin") set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc") set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests") @@ -131,7 +131,7 @@ set(CPACK_RPM_PACKAGE_URL "http://eurore IF(UNIX) SET(CPACK_RPM_PACKAGE_LICENSE "GPL") SET(CPACK_RPM_PACKAGE_GROUP "Applications/Sciences") - SET(CPACK_RPM_PACKAGE_REQUIRES "gnuplot >= 4.2, cmake >= 2.8") + 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")