--- imach/CMakeLists.txt	2016/02/19 09:26:29	1.12
+++ imach/CMakeLists.txt	2019/05/09 15:04:48	1.20
@@ -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 98r7)
+SET(IMACH_VERSION_MINOR 99r18)
 SET(IMACH_VERSION_PATCH 0)
 SET(IMACH_VERSION_NOTE "")
 SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
@@ -90,6 +90,7 @@ install(FILES "html/doc/mypar.imach" DES
 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}")
+#not working install(FILES "imach.desktop" DESTINATION "${XDG_APPS_DIR}")
 #install(FILES "html" DESTINATION "${DOCDIR}")
 
 
@@ -242,15 +243,29 @@ ADD_TEST(biaspar  IMaCh-${IMACH_VERSION}
 #   endif()
 # endif()
 # Add a target to generate API documentation with Doxygen
+option(BUILD_DOC "Build documentation" ON)
 if(UNIX)
   find_package(Doxygen)
-  if(DOXYGEN_FOUND)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/latex/Doxyfile.in
-      ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile @ONLY)
-    add_custom_target(doc
-      ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/latex/Doxyfile
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/latex
-      COMMENT "Generating IMaCh documentation with Doxygen" VERBATIM
-      )
-  endif()
-endif()
+  if(DOXYGEN_FOUND)# set input and output files
+    #set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/../docs/Doxyfile.in) ~/Documents/imach/cvs/imach/latex/Doxyfile.in
+    set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/latex/Doxyfile.in)
+    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+    # request to configure the file
+    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
+    message("Doxygen build started")
+
+    # note the option ALL which allows to build the docs together with the application
+    add_custom_target( doc_doxygen ALL
+      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      COMMENT "Generating API documentation with Doxygen in gnulinux/html/index.html"
+      VERBATIM )
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/html 
+      DESTINATION share/doc/${CMAKE_PROJECT_NAME})
+  else (DOXYGEN_FOUND)
+    message("Doxygen need to be installed to generate the doxygen documentation")
+  endif (DOXYGEN_FOUND)
+else (UNIX)
+  message("Doxygen only in UNIX doxygen documentation")
+endif (UNIX)
\ No newline at end of file