Try to correct the installation of header files in the mmg directory.

MmgTools · May 2, 2016 · 64d6d57 · 64d6d57
1 parent 37159bf
commit 64d6d57
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 17 deletions.
diff --git a/cmake/modules/mmg.cmake b/cmake/modules/mmg.cmake
@@ -129,25 +129,41 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
   ADD_CUSTOM_COMMAND(OUTPUT ${MMG_INCLUDE}/libmmgtypesf.h
     COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_SOURCE_DIR}/libmmgtypesf.h ${MMG_INCLUDE}/libmmgtypesf.h
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    DEPENDS ${COMMON_SOURCE_DIR}/libmmgtypesf.h) 
+    DEPENDS ${COMMON_SOURCE_DIR}/libmmgtypesf.h)
 
   IF ( NOT BUILD_MMG2D )
     ADD_CUSTOM_COMMAND(OUTPUT ${MMG2D_INCLUDE}/libmmg2df.h
       COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_SOURCE_DIR}/libmmg2df.h ${MMG2D_INCLUDE}/libmmg2df.h
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       DEPENDS ${MMG2D_SOURCE_DIR}/libmmg2df.h)
+    ADD_CUSTOM_TARGET(copy_2d_headers ALL
+      DEPENDS   ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d/libmmg2df.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d/libmmg2d.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d/libmmgtypesf.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d/libmmgtypes.h )
   ENDIF ()
+
   IF ( NOT BUILD_MMGS )
     ADD_CUSTOM_COMMAND(OUTPUT ${MMGS_INCLUDE}/libmmgsf.h
       COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_SOURCE_DIR}/libmmgsf.h ${MMGS_INCLUDE}/libmmgsf.h
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       DEPENDS ${MMGS_SOURCE_DIR}/libmmgsf.h)
+    ADD_CUSTOM_TARGET(copy_s_headers ALL
+      DEPENDS   ${CMAKE_SOURCE_DIR}/include/mmg/mmgs/libmmgsf.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmgs/libmmgs.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmgs/libmmgtypesf.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmgs/libmmgtypes.h )
   ENDIF()
   IF ( NOT BUILD_MMG3D )
     ADD_CUSTOM_COMMAND(OUTPUT ${MMG3D_INCLUDE}/libmmg3df.h
       COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_SOURCE_DIR}/libmmg3df.h ${MMG3D_INCLUDE}/libmmg3df.h
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       DEPENDS ${MMG3D_SOURCE_DIR}/libmmg3df.h)
+    ADD_CUSTOM_TARGET(copy_3d_headers ALL
+      DEPENDS  ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d/libmmg3df.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d/libmmg3d.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d/libmmgtypesf.h
+      ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d/libmmgtypes.h )
   ENDIF()
 
   ADD_CUSTOM_COMMAND(OUTPUT ${MMG_INCLUDE}/libmmgf.h
@@ -160,15 +176,26 @@ IF ( LIBMMG_STATIC OR LIBMMG_SHARED )
 
 
   # Install header files in project directory
-  FILE (INSTALL ${mmg2d_headers}
-    DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d
+  FILE(INSTALL  ${mmg2d_headers}
+    DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d/
     PATTERN "libmmg*f.h"  EXCLUDE)
-  FILE (INSTALL ${mmgs_headers} DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmgs
+  FILE(INSTALL  ${mmgs_headers}
+    DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmgs/
     PATTERN "libmmg*f.h"  EXCLUDE)
-  FILE (INSTALL ${mmg3d_headers} DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d
+  FILE(INSTALL  ${mmg3d_headers}
+    DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d/
     PATTERN "libmmg*f.h"  EXCLUDE)
-  FILE (INSTALL ${mmg_headers} DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg
+  FILE(INSTALL  ${mmg_headers}
+    DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/
     PATTERN "libmmg*f.h"  EXCLUDE)
+
+
+  ADD_CUSTOM_TARGET(copy_mmg_headers ALL
+    DEPENDS  ${CMAKE_SOURCE_DIR}/include/mmg/libmmgf.h
+    ${CMAKE_SOURCE_DIR}/include/mmg/libmmg.h
+    ${CMAKE_SOURCE_DIR}/include/mmg/libmmgtypesf.h
+    ${CMAKE_SOURCE_DIR}/include/mmg/libmmgtypes.h )
+
 ENDIF()
 
 ############################################################################

diff --git a/cmake/modules/mmg2d.cmake b/cmake/modules/mmg2d.cmake
@@ -128,7 +128,7 @@ IF ( LIBMMG2D_STATIC OR LIBMMG2D_SHARED )
     ${MMG2D_INCLUDE}/libmmg2df.h
     ${MMG2D_INCLUDE}/libmmgtypes.h
     ${MMG2D_INCLUDE}/libmmgtypesf.h
-    ) 
+    )
   # Install header files in /usr/local or equivalent
   INSTALL(FILES ${mmg2d_headers} DESTINATION include/mmg/mmg2d)
 
@@ -142,9 +142,12 @@ IF ( LIBMMG2D_STATIC OR LIBMMG2D_SHARED )
     DEPENDS ${MMG2D_SOURCE_DIR}/libmmg2df.h)
 
   # Install header files in project directory
-  FILE (INSTALL ${mmg2d_headers}    
-  DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmg2d  
-  PATTERN "libmmg*f.h"  EXCLUDE)
+  FILE(INSTALL  ${mmg2d_headers} DESTINATION ${MMG2D_INCLUDE}
+    PATTERN "libmmg*f.h"  EXCLUDE)
+
+  ADD_CUSTOM_TARGET(copy_2d_headers ALL
+    DEPENDS  ${MMG2D_INCLUDE}/libmmg2df.h  ${MMG2D_INCLUDE}/libmmg2d.h
+     ${MMG2D_INCLUDE}/libmmgtypesf.h  ${MMG2D_INCLUDE}/libmmgtypes.h )
 
 ENDIF()
 

diff --git a/cmake/modules/mmg3d.cmake b/cmake/modules/mmg3d.cmake
@@ -185,12 +185,14 @@ IF ( LIBMMG3D_STATIC OR LIBMMG3D_SHARED )
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     DEPENDS ${MMG3D_SOURCE_DIR}/libmmg3df.h)
 
-  ADD_CUSTOM_TARGET(headers_copy ALL
+  # Install header files in project directory
+  FILE(INSTALL  ${mmg3d_headers} DESTINATION ${MMG3D_INCLUDE}
+    PATTERN "libmmg*f.h"  EXCLUDE)
+
+  ADD_CUSTOM_TARGET(copy_3d_headers ALL
     DEPENDS  ${MMG3D_INCLUDE}/libmmg3df.h  ${MMG3D_INCLUDE}/libmmg3d.h
-    ${COMMON_SOURCE_DIR}/libmmgtypesf.h ${COMMON_SOURCE_DIR}/libmmgtypes.h )
+    ${MMG3D_INCLUDE}/libmmgtypesf.h ${MMG3D_INCLUDE}/libmmgtypes.h )
 
-  # Install header files in project directory
-  #FILE ( INSTALL ${mmg3d_headers} DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmg3d)
 ENDIF()
 
 ############################################################################

diff --git a/cmake/modules/mmgs.cmake b/cmake/modules/mmgs.cmake
@@ -143,10 +143,14 @@ IF ( LIBMMGS_STATIC OR LIBMMGS_SHARED )
     DEPENDS ${MMGS_SOURCE_DIR}/libmmgsf.h)
 
   # Install header files in project directory
-  FILE ( INSTALL ${mmgs_headers}
-    DESTINATION ${CMAKE_SOURCE_DIR}/include/mmg/mmgs
+  FILE(INSTALL  ${mmgs_headers} DESTINATION ${MMGS_INCLUDE}
     PATTERN "libmmg*f.h"  EXCLUDE)
 
+  ADD_CUSTOM_TARGET(copy_s_headers ALL
+    DEPENDS  ${MMGS_INCLUDE}/libmmgsf.h  ${MMGS_INCLUDE}/libmmgs.h
+     ${MMGS_INCLUDE}/libmmgtypesf.h  ${MMGS_INCLUDE}/libmmgtypes.h )
+
+
 ENDIF()
 
 ############################################################################

diff --git a/src/common/mmgcommon.h b/src/common/mmgcommon.h
@@ -55,7 +55,7 @@ extern "C" {
 #include "eigenv.h"
 #include "libmmgcommon.h"
 
-#define MG_VER   "5.1.0-beta5"
+#define MG_VER   "5.1.0"
 #define MG_REL   "Dec 4, 2015"
 #define MG_CPY   "Copyright (c) IMB-LJLL, 2004-"
 #define MG_STR   "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"