--- imach/CMakeLists.txt	2019/05/21 15:55:06	1.21
+++ imach/CMakeLists.txt	2021/05/20 12:38:52	1.27
@@ -8,7 +8,7 @@
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
 set(PACKAGE_NAME "imach")
 SET(IMACH_VERSION_MAJOR 0)
-SET(IMACH_VERSION_MINOR 99r19)
+SET(IMACH_VERSION_MINOR 99r24)
 SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
@@ -24,7 +24,7 @@ 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-2021 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}")
 
@@ -48,8 +48,8 @@ CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/te
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/mydata.txt" "html/doc/data/mydata.txt" COPYONLY)
 # Test files
 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/testV1V2.imach" "tests/testV1V2.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)
 
 
 set (imach_SRCS ./src/imach.c)
@@ -72,14 +72,20 @@ if(UNIX)
   set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
   set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc")
   set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests")
+  set(DATADIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests/data")
   set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man/man1")
   #set(EXAMPLE_CONF_DIR ${DOCDIR})
   set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
   set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
   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()
 if(MSVC)
   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_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
@@ -94,9 +100,11 @@ install(FILES "html/doc/data/mydata.txt"
 install(FILES "html/doc/biaspar.imach" DESTINATION "${DOCDIR}")
 install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")
 install(FILES "src/README.txt" DESTINATION "${DOCDIR}")
-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}")
+#install(FILES "tests/testV1V2.imach" DESTINATION "${TESTDIR}")
+install(FILES "tests/rtestV1V2.imach" DESTINATION "${TESTDIR}")
+install(FILES "tests/testV2.imach" DESTINATION "${TESTDIR}")
+install(FILES "tests/rtestV2.imach" DESTINATION "${TESTDIR}")
+install(FILES "tests/data/data2.txt" DESTINATION "${DATADIR}")
 #not working install(FILES "imach.desktop" DESTINATION "${XDG_APPS_DIR}")
 #install(FILES "html" DESTINATION "${DOCDIR}")
 
@@ -108,6 +116,7 @@ set(CPACK_PACKAGE_CONTACT "Nicolas Broua
 set(CPACK_PACKAGE_VENDOR "INED")
 SET(CPACK_PACKAGE_VENDOR "IMaCh, INED")
 SET(CPACK_PACKAGE_LICENSE "GPLv2")
+#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${IMACH_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${IMACH_VERSION_MINOR}")
@@ -202,7 +211,7 @@ INCLUDE(CPack)
 #   set(VERSION_PATCH "${BUILD_VERSION_PATCH}")
 # ENDIF()
 file( GLOB_RECURSE parameter_files RELATIVE
-"${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" )
+"${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" "tests/*.imach" )
 foreach( parameter_file ${parameter_files} )
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
@@ -301,3 +310,4 @@ if(UNIXDODOXYGEN)
   endif (DOXYGEN_FOUND)
   message("Doxygen only in UNIX doxygen documentation")
 endif (UNIXDODOXYGEN)
+