use apf_simConfig.h to access sim version

Installing apf_simConfig.h as it is used in tests and could be helpful for others. I can't think of a good reason not to install it.
SCOREC · Mar 5, 2024 · 9f4e908 · 9f4e908
1 parent f37053e
commit 9f4e908
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/apf_sim/CMakeLists.txt b/apf_sim/CMakeLists.txt
@@ -7,6 +7,20 @@ if(NOT ENABLE_SIMMETRIX)
   return()
 endif()
 
+option(ENABLE_FIELDSIM "Enable use of FieldSim from Simmetrix SimModSuite" FALSE)
+message(STATUS "ENABLE_FIELDSIM: ${ENABLE_FIELDSIM}")
+set(USE_FIELDSIM FALSE)
+if( ${SIMMODSUITE_SimField_FOUND} AND ENABLE_FIELDSIM )
+  set(USE_FIELDSIM TRUE)
+endif()
+set(USE_SIM_ADVMESHING ${HAVE_SIMADVMESHING})
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/apf_simConfig.h.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/apf_simConfig.h")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apf_simConfig.h
+        DESTINATION include)
+
 #Sources & Headers
 set(SOURCES apfSIM.cc)
 set(HEADERS apfSIM.h)
@@ -21,21 +35,11 @@ target_include_directories(apf_sim PUBLIC
     $<INSTALL_INTERFACE:include>
     )
 
-option(ENABLE_FIELDSIM "Enable use of FieldSim from Simmetrix SimModSuite" FALSE)
-message(STATUS "ENABLE_FIELDSIM: ${ENABLE_FIELDSIM}")
-set(USE_FIELDSIM FALSE)
-if( ${SIMMODSUITE_SimField_FOUND} AND ENABLE_FIELDSIM )
-  set(USE_FIELDSIM TRUE)
-endif()
-set(USE_SIM_ADVMESHING ${HAVE_SIMADVMESHING})
-
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/apf_simConfig.h.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/apf_simConfig.h")
 #directory containing apf_simConfig.h
-target_include_directories(apf_sim PRIVATE
+target_include_directories(apf_sim PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 
+
 scorec_export_library(apf_sim)
 
 bob_end_subdir()
diff --git a/phasta/phAttrib.cc b/phasta/phAttrib.cc
@@ -6,7 +6,7 @@
 #include <SimModel.h>
 #include <cstdlib>
 #include <iostream>
-
+#include "apf_simConfig.h"
 
 typedef ph::BC* (*BCFactory)(pAttribute a, pGEntity ge);
 typedef std::map<std::string, BCFactory> BCFactories;

diff --git a/phasta/phMeshQuality.cc b/phasta/phMeshQuality.cc
@@ -8,7 +8,6 @@
 #include <apfMatrix.h>
 #include <maSize.h>
 #include <maShape.h>
-//#include "apf_simConfig.h"
 
 #ifdef HAVE_SIMMETRIX
 #include <SimUtil.h>

diff --git a/test/generate.cc b/test/generate.cc
@@ -10,6 +10,7 @@
 #include <SimUtil.h>
 #include <apfSIM.h>
 #include <apfMDS.h>
+#include <apf_simConfig.h>
 #include "gmi_sim_config.h"
 #include <gmi_sim.h>
 #include <apf.h>

diff --git a/test/rm_extrusion.cc b/test/rm_extrusion.cc
@@ -4,7 +4,7 @@
 #include <SimPartitionedMesh.h>
 #include <SimUtil.h>
 #include <apfSIM.h>
-#include <../apf_sim/apf_simConfig.h>
+#include <apf_simConfig.h>
 #include <apfMDS.h>
 #include <gmi.h>
 #include <gmi_sim.h>

diff --git a/test/simTranslate.cc b/test/simTranslate.cc
@@ -18,8 +18,7 @@
 #include <stdlib.h>
 #include <string>
 
-/* hack to get SIMMODSUITE_MAJOR_VERSION and SIMMODSUITE_MINOR_VERSION */
-#include "../apf_sim/apf_simConfig.h"
+#include <apf_simConfig.h>
 /* cheap hackish way to get SIM_PARASOLID and SIM_ACIS */
 #include "gmi_sim_config.h"
 #include <gmi_sim.h>