From d3ba3de9bcd31e7feaf8f06a6e5c82aabb20daeb Mon Sep 17 00:00:00 2001
From: ndjinga <michael.ndjinga@cea.fr>
Date: Wed, 23 Sep 2020 13:23:26 +0200
Subject: [PATCH] Corrected instalation of documentation

---
 CDMATH/CMakeLists.txt    | 8 ++------
 CMakeLists.txt           | 4 ++++
 CoreFlows/CMakeLists.txt | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CDMATH/CMakeLists.txt b/CDMATH/CMakeLists.txt
index d8d89d9..758a4e3 100755
--- a/CDMATH/CMakeLists.txt
+++ b/CDMATH/CMakeLists.txt
@@ -7,9 +7,6 @@ project (CDMATH)
 set (CDMATH_VERSION_MAJOR 1)
 set (CDMATH_VERSION_MINOR 0)
 
-include(ExternalProject)#For PETSc, MED and MEDCoupling
-set (CMAKE_BUILD_TYPE Release CACHE STRING "Installation mode")
-
 # Project options
 option (CDMATH_WITH_PETSC "Compile CDMATH with PETSc linking." ON)
 option (CDMATH_WITH_DOCUMENTATION "Generate documentation with doxygen." ON)
@@ -81,13 +78,13 @@ if (CDMATH_WITH_DOCUMENTATION)
   add_custom_target (docCDMATH COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
   							  SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
   if   ( IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION doc/cdmath-dev-doc)
+    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION share/doc/cdmath-dev-doc)
   endif( IS_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
 endif(CDMATH_WITH_DOCUMENTATION)
 
 #Debug option : todo = sort flags
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg -fprofile-arcs -ftest-coverage -lgcov")
-if   (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+if   (CMAKE_BUILD_TYPE STREQUAL "Debug")
   SET(CMAKE_EXE_LINKER_FLAGS "-pg -fprofile-arcs -ftest-coverage -lgcov")
   SET(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
 endif(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
@@ -111,7 +108,6 @@ endif ()
 # Configuration file
 configure_file(
     ${PROJECT_SOURCE_DIR}/env_CDMATH.sh
-    ${CMAKE_INSTALL_PREFIX}/env_CDMATH.sh
     @ONLY
 )
 													    
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 909b4f7..3bb4018 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,12 @@ set (DOWNLOAD_MED           http://files.salome-platform.org/Salome/other/med-4.
 set (DOWNLOAD_MEDCOUPLING   http://files.salome-platform.org/Salome/other/medCoupling-9.4.0.tar.gz
      CACHE STRING           "MEDCoupling tarball path/url" )
 
+set (CMAKE_BUILD_TYPE Release CACHE STRING "Installation mode")
+
 list (APPEND CMAKE_MODULE_PATH "${SOLVERLAB_SOURCE_DIR}/cmake_files")
+
 include(ExternalProject)#For PETSc, MED and MEDCoupling
+
 ######################################################
 # Detection or compilation of PETSc+SLEPc+HDF5       #
 ######################################################
diff --git a/CoreFlows/CMakeLists.txt b/CoreFlows/CMakeLists.txt
index 529e534..9f3a45c 100755
--- a/CoreFlows/CMakeLists.txt
+++ b/CoreFlows/CMakeLists.txt
@@ -65,8 +65,8 @@ if (COREFLOWS_WITH_DOCUMENTATION)
       )                                                                                                     #
   add_custom_target (docCoreFlows COMMAND ${DOXYGEN_EXECUTABLE}                                                  #
   SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)			                                            #
-  install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION share/doc/CoreFlows OPTIONAL)                  #
-  INSTALL(FILES ${CoreFlows_SOURCE_DIR}/Documentation/CoreFlows.pdf DESTINATION share/doc/CoreFlows OPTIONAL)	    #
+  install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION share/doc/coreflows-dev-doc OPTIONAL)                  #
+  INSTALL(FILES ${CoreFlows_SOURCE_DIR}/Documentation/CoreFlows.pdf DESTINATION share/doc OPTIONAL)	    #
 endif ()                                                                                                    #
                                                                                                             #
 # ------------- --------------------------------------------------------------------------------------------#
@@ -114,7 +114,6 @@ INSTALL(TARGETS CoreFlowsMainExe DESTINATION bin)						    #
 													    #
 configure_file(
     ${PROJECT_SOURCE_DIR}/env_CoreFlows.sh
-    ${CMAKE_INSTALL_PREFIX}/env_CoreFlows.sh
     @ONLY
 )
 													    
-- 
2.39.2