--- imach/CMakeLists.txt	2019/05/22 20:20:22	1.22
+++ imach/CMakeLists.txt	2020/02/22 21:01:54	1.24
@@ -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 99r20)
 SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
@@ -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)
@@ -78,9 +78,14 @@ if(UNIX)
   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")
@@ -95,10 +100,7 @@ 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/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}")
@@ -114,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}")
@@ -307,3 +310,4 @@ if(UNIXDODOXYGEN)
   endif (DOXYGEN_FOUND)
   message("Doxygen only in UNIX doxygen documentation")
 endif (UNIXDODOXYGEN)
+