From: N. Brouard <brouard@ined.fr>
Date: Thu, 3 Sep 2015 07:14:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: imach-099s7~339
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=e2d752d07710087aa03b347bff357efe47ec2e05;p=.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 992fd88..9d35abd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,9 @@ ADD_SUBDIRECTORY(html)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(distributions)
 #if (${WIN32})
+#if(APPLE)
+#  set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
+#endif()
 if(UNIX)
   #   set(CMAKE_CXX_COMPILER "gcc")
   target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m)
@@ -138,9 +141,24 @@ INCLUDE(CPack)
 # else()
 #   set(VERSION_PATCH "${BUILD_VERSION_PATCH}")
 # ENDIF()
+file( GLOB_RECURSE parameter_files RELATIVE
+"${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" )
+foreach( parameter_file ${parameter_files} )
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
+    COMMAND cmake -E copy
+"${CMAKE_CURRENT_SOURCE_DIR}/${parameter_file}"
+"${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${parameter_file}"
+  )
+  list( APPEND parameter_files_dest "${parameter_file}" )
+endforeach( parameter_file )
+
+#add_custom_target( CopyParameter ALL DEPENDS ${parameter_files_dest} )
 ENABLE_TESTING()
-SUBDIRS(html/doc)
-SUBDIRS(html/doc/data)
+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(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")
diff --git a/distributions/osx/Background.png b/distributions/osx/Background.png
new file mode 100755
index 0000000..93b6bb0
Binary files /dev/null and b/distributions/osx/Background.png differ
diff --git a/distributions/osx/Background.xcf b/distributions/osx/Background.xcf
new file mode 100644
index 0000000..dee3750
Binary files /dev/null and b/distributions/osx/Background.xcf differ
diff --git a/src/Makefile b/src/Makefile
index d252183..9402135 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -508,8 +508,8 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
 md5:
 	ls Output/* | xargs md5sum
 upload:
-	rsync -v Output/IMaCh-0.98q4-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-	rsync -v Output/imach0.98q4.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/IMaCh-0.98q5-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach0.98q5.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #	rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o