Diff for /imach/CMakeLists.txt between versions 1.23 and 1.31

version 1.23, 2019/05/22 20:20:42 version 1.31, 2022/07/22 12:05:33
Line 8 Line 8
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)  # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
 set(PACKAGE_NAME "imach")  set(PACKAGE_NAME "imach")
 SET(IMACH_VERSION_MAJOR 0)  SET(IMACH_VERSION_MAJOR 0)
 SET(IMACH_VERSION_MINOR 99r19)  SET(IMACH_VERSION_MINOR 99r28)
 SET(IMACH_VERSION_PATCH 0)  SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")  SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})  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(@NOTINNOREG@ )
 SET(@NOREG@ )  SET(@NOREG@ )
 SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)  SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)
Line 24  SET(@LICENSEFILE@ Copying) Line 24  SET(@LICENSEFILE@ Copying)
 SET(@PACKAGE@ imach)  SET(@PACKAGE@ imach)
 SET(@DICTLANG@ en)  SET(@DICTLANG@ en)
 SET(@VERMAJOR@ )  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})  #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}")  #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")
   
 # #PROJECT(IMaCh${IMACH_VERSION_MAJOR})  # #PROJECT(IMaCh${IMACH_VERSION_MAJOR})
 PROJECT (IMaCh)  PROJECT (imach)
   
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
   
Line 48  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/te Line 48  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/te
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/mydata.txt" "html/doc/data/mydata.txt" COPYONLY)  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/mydata.txt" "html/doc/data/mydata.txt" COPYONLY)
 # Test files  # Test files
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/data2.txt" "tests/data/data2.txt" COPYONLY)  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/data2.txt" "tests/data/data2.txt" COPYONLY)
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV2.imach" "tests/testV2.imach" COPYONLY)  #CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV2.imach" "tests/testV2.imach" COPYONLY)
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV1V2.imach" "tests/testV1V2.imach" COPYONLY)  #CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV1V2.imach" "tests/testV1V2.imach" COPYONLY)
   
   
 set (imach_SRCS ./src/imach.c)  set (imach_SRCS ./src/imach.c)
 SET( CMAKE_VERBOSE_MAKEFILE on )  SET( CMAKE_VERBOSE_MAKEFILE on )
 #SET(CMAKE_INSTALL_PREFIX "/usr/local")  #SET(CMAKE_INSTALL_PREFIX "/usr/local")
 ADD_EXECUTABLE (IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS})  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-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries )
 #INSTALL(TARGETS imach DESTINATION bin COMPONENT binaries )  #INSTALL(TARGETS imach DESTINATION bin COMPONENT binaries )
 ADD_SUBDIRECTORY(html)  ADD_SUBDIRECTORY(html)
 ADD_SUBDIRECTORY(tests)  ADD_SUBDIRECTORY(tests)
Line 68  ADD_SUBDIRECTORY(tests) Line 68  ADD_SUBDIRECTORY(tests)
 #endif()  #endif()
 if(UNIX)  if(UNIX)
   #   set(CMAKE_CXX_COMPILER "gcc")    #   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(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
   set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc")    set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc")
   set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests")    set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests")
Line 78  if(UNIX) Line 78  if(UNIX)
   set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")    set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
   set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")    set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
   set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")    set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
     install(FILES "distributions/gnulinux/imach.1" DESTINATION "${MANDIR}")
     install(FILES "distributions/gnulinux/imach.png" DESTINATION "${ICONDIR}")
     install(FILES "distributions/gnulinux/imach.desktop" DESTINATION "${XDG_APPS_DIR}")
 endif()  endif()
 if(MSVC)  if(MSVC)
   set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")    set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
     set(TESTDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/tests")
     set(DATADIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/tests/data")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
Line 95  install(FILES "html/doc/data/mydata.txt" Line 100  install(FILES "html/doc/data/mydata.txt"
 install(FILES "html/doc/biaspar.imach" DESTINATION "${DOCDIR}")  install(FILES "html/doc/biaspar.imach" DESTINATION "${DOCDIR}")
 install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")  install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")
 install(FILES "src/README.txt" DESTINATION "${DOCDIR}")  install(FILES "src/README.txt" DESTINATION "${DOCDIR}")
 install(FILES "distributions/gnulinux/imach.1" DESTINATION "${MANDIR}")  #install(FILES "tests/testV1V2.imach" DESTINATION "${TESTDIR}")
 install(FILES "distributions/gnulinux/imach.png" DESTINATION "${ICONDIR}")  
 install(FILES "distributions/gnulinux/imach.desktop" DESTINATION "${XDG_APPS_DIR}")  
 install(FILES "tests/testV1V2.imach" DESTINATION "${TESTDIR}")  
 install(FILES "tests/rtestV1V2.imach" DESTINATION "${TESTDIR}")  install(FILES "tests/rtestV1V2.imach" DESTINATION "${TESTDIR}")
 install(FILES "tests/testV2.imach" DESTINATION "${TESTDIR}")  install(FILES "tests/testV2.imach" DESTINATION "${TESTDIR}")
 install(FILES "tests/rtestV2.imach" DESTINATION "${TESTDIR}")  install(FILES "tests/rtestV2.imach" DESTINATION "${TESTDIR}")
Line 129  set(CPACK_RPM_PACKAGE_URL "http://eurore Line 131  set(CPACK_RPM_PACKAGE_URL "http://eurore
 IF(UNIX)  IF(UNIX)
   SET(CPACK_RPM_PACKAGE_LICENSE "GPL")    SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
   SET(CPACK_RPM_PACKAGE_GROUP "Applications/Sciences")    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_GENERATOR "TXZ")
   SET(CPACK_SOURCE_GENERATOR "TXZ")    SET(CPACK_SOURCE_GENERATOR "TXZ")
   SET(CPACK_SOURCE_TBZ2 "OFF")    SET(CPACK_SOURCE_TBZ2 "OFF")

Removed from v.1.23  
changed lines
  Added in v.1.31


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>