Merge pull request #82 from rubendibattista/fix-headers-install

Install all headers
mutationpp · Jun 5, 2019 · 39b6386 · 39b6386
2 parents ed6df82 + 3efecb2
commit 39b6386
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ cmake_policy(SET CMP0048 NEW)
 set(CMAKE_CXX_STANDARD 11)
 
 project(mutation++
-    VERSION 0.3.1
+    VERSION 0.3.2
     LANGUAGES CXX
 )
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -133,12 +133,17 @@ install(FILES
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/mutation++
 )
 
+# Install Headers
+get_property(mutation++_HDRS GLOBAL PROPERTY mutation++_HDRS)
+set_target_properties(mutation++ PROPERTIES PUBLIC_HEADER "${mutation++_HDRS}")
+set(MUTATIONPP_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/mutation++")
 
 install(TARGETS mutation++ ${mutation_exes} EXPORT mutation++Targets
     LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    INCLUDES DESTINATION ${MUTATIONPP_INCLUDE_DIR}
+    PUBLIC_HEADER DESTINATION ${MUTATIONPP_INCLUDE_DIR}
 )
 
 export(EXPORT mutation++Targets

diff --git a/src/gsi/CMakeLists.txt b/src/gsi/CMakeLists.txt
@@ -45,17 +45,18 @@ add_sources(mutation++
     SurfaceState.cpp
 )
 
-install(FILES DiffusionVelocityCalculator.h DESTINATION include/mutation++)
-install(FILES GasFourierHeatFluxCalculator.h DESTINATION include/mutation++)
-install(FILES GasSurfaceInteraction.h DESTINATION include/mutation++)
-install(FILES GSIRateLaw.h DESTINATION include/mutation++)
-install(FILES GSIRateManager.h DESTINATION include/mutation++)
-install(FILES GSIReaction.h DESTINATION include/mutation++)
-install(FILES GSIStoichiometryManager.h DESTINATION include/mutation++)
-install(FILES MassBlowingRate.h DESTINATION include/mutation++)
-install(FILES SolidProperties.h DESTINATION include/mutation++)
-install(FILES Surface.h DESTINATION include/mutation++)
-install(FILES SurfaceChemistry.h DESTINATION include/mutation++)
-install(FILES SurfaceProperties.h DESTINATION include/mutation++)
-install(FILES SurfaceRadiation.h DESTINATION include/mutation++)
-install(FILES SurfaceState.h DESTINATION include/mutation++)
+add_headers(mutation++
+    DiffusionVelocityCalculator.h
+    GasFourierHeatFluxCalculator.h
+    GasSurfaceInteraction.h
+    GSIRateLaw.h
+    GSIRateManager.h
+    GSIReaction.h
+    GSIStoichiometryManager.h
+    MassBlowingRate.h
+    SolidProperties.h
+    SurfaceChemistry.h
+    SurfaceRadiation.h
+    SurfaceState.h
+)
+