From 3626ebf5ceb74693bdeb3e18c54638656a4eafc8 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@iap.fr>
Date: Thu, 15 Aug 2019 13:12:57 +0300
Subject: [PATCH] Add support for setup.py in the rest of cmake files. Fix for
 HDF5.

---
 CMakeLists.txt        |  1 +
 sample/CMakeLists.txt | 10 ++++++----
 src/CMakeLists.txt    | 34 ++++++++++++++++++----------------
 src/hdf5_array.hpp    |  4 ++--
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1d4318..0e21c7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ option(INTERNAL_BOOST "Build internal version of BOOST" OFF)
 option(USE_GIT_VERSION "Use GIT version to pad version number" OFF)
 option(YORICK_SUPPORT "Add for pleasant yorick support" ON)
 option(BUILD_PYTHON "Build the python modules" ON)
+option(COSMOTOOL_PYTHON_PACKAGING "Flag set to on if we only want the python package to be installed" OFF)
 IF(USE_GIT_VERSION)
   get_git_head_revision(HEAD GIT_VER)
   SET(EXTRA_VERSION "-${GIT_VER}")
diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt
index 53429da..561751c 100644
--- a/sample/CMakeLists.txt
+++ b/sample/CMakeLists.txt
@@ -92,10 +92,12 @@ if (Boost_FOUND)
     add_executable(simpleDistanceFilter simpleDistanceFilter.cpp)
     target_link_libraries(simpleDistanceFilter ${tolink})
 
-    install(TARGETS simple3DFilter simpleDistanceFilter
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib)
+    if (NOT COSMOTOOL_PYTHON_PACKAGING)
+      install(TARGETS simple3DFilter simpleDistanceFilter
+          RUNTIME DESTINATION bin
+          LIBRARY DESTINATION lib
+          ARCHIVE DESTINATION lib)
+    endif()
 
     add_executable(gadgetToArray gadgetToArray.cpp)
     target_link_libraries(gadgetToArray ${tolink})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 927785e..196ed36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -99,19 +99,21 @@ else (BUILD_SHARED_LIBS)
   set_property(TARGET CosmoTool PROPERTY POSITION_INDEPENDENT_CODE ON)
 endif (BUILD_SHARED_LIBS)
 
-install(TARGETS CosmoTool 
-	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib)
-
-if (BUILD_SHARED_LIBS)
-  install(TARGETS CosmoTool_static 
-  	  LIBRARY DESTINATION lib
-	  ARCHIVE DESTINATION lib)
-endif (BUILD_SHARED_LIBS)
-
-install(DIRECTORY . DESTINATION include/CosmoTool
-	FILES_MATCHING PATTERN "*.hpp")
-install(DIRECTORY ${OMPTL_BUILD_DIR}
-     DESTINATION include/CosmoTool)
-install(DIRECTORY . DESTINATION include/CosmoTool
-	FILES_MATCHING PATTERN "*.tcc")
+IF(NOT COSMOTOOL_PYTHON_PACKAGING)
+ install(TARGETS CosmoTool 
+ 	LIBRARY DESTINATION lib
+ 	ARCHIVE DESTINATION lib)
+ 
+ if (BUILD_SHARED_LIBS)
+   install(TARGETS CosmoTool_static 
+   	  LIBRARY DESTINATION lib
+ 	  ARCHIVE DESTINATION lib)
+ endif (BUILD_SHARED_LIBS)
+ 
+ install(DIRECTORY . DESTINATION include/CosmoTool
+ 	FILES_MATCHING PATTERN "*.hpp")
+ install(DIRECTORY ${OMPTL_BUILD_DIR}
+      DESTINATION include/CosmoTool)
+ install(DIRECTORY . DESTINATION include/CosmoTool
+ 	FILES_MATCHING PATTERN "*.tcc")
+ENDIF()
diff --git a/src/hdf5_array.hpp b/src/hdf5_array.hpp
index 8e222f8..711c0bc 100644
--- a/src/hdf5_array.hpp
+++ b/src/hdf5_array.hpp
@@ -55,10 +55,10 @@ namespace CosmoTool {
 #if H5_VERSION_GE(1,10,1)
   typedef H5::H5Location H5_CommonFileGroup;
 #else
-  typedef H5::CommonFG H5_CommonFileGroup;
+  typedef H5::Group H5_CommonFileGroup;
 #endif
 #else
-  typedef H5::Group H5_CommonFileGroup;
+  typedef H5::CommonFG H5_CommonFileGroup;
 #endif
 
   //!_______________________________________________________________________________________