Summary: 0.98r0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 910d69f231f5038ec86e99858479cf12a4cd1366..06ba5af7d98e33f6ae106346ce03afcf1fa22bc5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,23 @@
 #  endif()
 # SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
 SET(IMACH_VERSION_MAJOR 0)
-SET(IMACH_VERSION_MINOR 98q5)
+SET(IMACH_VERSION_MINOR 98r0)
 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(@NOTINNOREG@ )
+SET(@NOREG@ )
+SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)
+SET(@APPCOMPILATIONMODE@ icl)
+SET(@VERSION@ ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
+SET(@GNUPLOTVERSION@ 4.6)
+SET(@INFOBEFOREFILE@ README.txt)
+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) - Intel Software 2015")
 #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}")
 
@@ -27,10 +40,16 @@ CONFIGURE_FILE(
   "${PROJECT_SOURCE_DIR}/config.h.in"
   "${PROJECT_BINARY_DIR}/config.h"
 )
+# Examples for the documentation
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/mypar.imach.in" "html/doc/mypar.imach")
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/biaspar.imach.in" "html/doc/biaspar.imach")
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data1.txt" "html/doc/data1.txt" COPYONLY)
 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)
+
 
 set (imach_SRCS ./src/imach.c)
 SET( CMAKE_VERBOSE_MAKEFILE on )
@@ -164,6 +183,8 @@ ENABLE_TESTING()
 ADD_SUBDIRECTORY(html/doc)
 ADD_SUBDIRECTORY(html/doc/data)
 install(FILES "${PROJECT_SOURCE_DIR}/html/doc/mypar.imach" DESTINATION "html/doc/mypar.imach")
+ADD_TEST(testV2.imach  IMaCh-${IMACH_VERSION} tests/testV2.imach )
+ADD_TEST(testV1V2.imach  IMaCh-${IMACH_VERSION} tests/testV1V2.imach )
 ADD_TEST(mypar  IMaCh-${IMACH_VERSION} html/doc/mypar.imach )
 ADD_TEST(biaspar  IMaCh-${IMACH_VERSION} html/doc/biaspar.imach )
 #SET(FAB "po" CACHE STRING "Some user-specified option")