From cf57c7ef1e71a3f01f764375ceed9b0120862c5f Mon Sep 17 00:00:00 2001
From: "N. Brouard" <brouard@ined.fr>
Date: Sat, 22 Feb 2020 21:01:54 +0000
Subject: [PATCH] Summary: r20

---
 CMakeLists.txt | 16 +++++++++-------
 src/version.h  | 10 +++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75fc5c6..ac23274 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}/tests/data1.txt" "html/doc/data1.txt" COPY
 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" DESTINATION "${DOCDIR}/data")
 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}")
diff --git a/src/version.h b/src/version.h
index f9a6b8f..bd9f030 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
-#define __IMACH_VERSION_MAJOR__ 0
-#define __IMACH_VERSION_MINOR__ 99r20
-#define __IMACH_VERSION_PATCH__ 0
-
-#define __IMACH_VERSION__ "0.99r19"
+#define __IMACH_VERSION_MAJOR__ 0
+#define __IMACH_VERSION_MINOR__ 99r20
+#define __IMACH_VERSION_PATCH__ 0
+
+#define __IMACH_VERSION__ "0.99r20"
-- 
2.43.0