Merge pull request #454 from SCOREC/apw/capVol_mds_adapt

Refactor Capstone support

Author: cwsmith

CMakeLists.txt

@@ -105,14 +105,18 @@ set(Trilinos_PREFIX "" CACHE STRING "Trilinos installation directory")
 option(SKIP_SIMMETRIX_VERSION_CHECK "enable at your own risk; it may result in undefined behavior" OFF)
 option(ENABLE_SIMMETRIX "Build with Simmetrix support" OFF)
 message(STATUS "ENABLE_SIMMETRIX: ${ENABLE_SIMMETRIX}")
-option(ENABLE_CAPSTONE "Build with Capstone support" OFF)
-message(STATUS "ENABLE_CAPSTONE: ${ENABLE_CAPSTONE}")
+option(PUMI_ENABLE_CAPSTONE "Build PUMI with Capstone support" OFF)
+# For compatibility and to inherit from owning projects:
+if(ENABLE_CAPSTONE)
+  set(PUMI_ENABLE_CAPSTONE ON)
+endif()
+message(STATUS "PUMI_ENABLE_CAPSTONE: ${PUMI_ENABLE_CAPSTONE}")
 
 if(ENABLE_SIMMETRIX)
   add_definitions(-DHAVE_SIMMETRIX)
 endif()
-if(ENABLE_CAPSTONE)
-  add_definitions(-DHAVE_CAPSTONE)
+if(PUMI_ENABLE_CAPSTONE)
+  add_definitions(-DPUMI_HAS_CAPSTONE)
 endif()
 
 option(ENABLE_FPP "Build with snapping to first problem plane" OFF)
@@ -144,8 +148,8 @@ if(ENABLE_SIMMETRIX)
   find_package(SimModSuite MODULE REQUIRED)
 endif()
 
-if(ENABLE_CAPSTONE)
-  set(SCOREC_USE_CreateMG_DEFAULT ${ENABLE_CAPSTONE})
+if(PUMI_ENABLE_CAPSTONE)
+  set(SCOREC_USE_CreateMG_DEFAULT ${PUMI_ENABLE_CAPSTONE})
   bob_public_dep(CreateMG)
 endif()
 

apf/apfMesh.cc

@@ -51,7 +51,7 @@ int const quad_edge_verts[4][2] =
 */
 
 int const tet_edge_verts[6][2] =
-#ifndef HAVE_CAPSTONE
+#ifndef PUMI_HAS_CAPSTONE
 {{0,1}
 ,{1,2}
 ,{2,0}
@@ -78,7 +78,7 @@ int const pyramid_edge_verts[8][2] =
 ,{0,4},{1,4},{2,4},{3,4}};
 
 int const tet_tri_verts[4][3] =
-#ifndef HAVE_CAPSTONE
+#ifndef PUMI_HAS_CAPSTONE
 {{0,1,2}
 ,{0,1,3}
 ,{1,2,3}

apf_cap/CMakeLists.txt

@@ -3,7 +3,7 @@ if(DEFINED TRIBITS_PACKAGE)
   return()
 endif()
 
-if(NOT ENABLE_CAPSTONE)
+if(NOT PUMI_ENABLE_CAPSTONE)
   return()
 endif()
 
@@ -12,25 +12,35 @@ include(CheckIncludeFileCXX)
 cmake_policy(SET CMP0075 NEW) # Observe CMAKE_REQUIRED_LIBRARIES.
 
 #Sources & Headers
-set(SOURCES apfCAP.cc)
+set(SOURCES apfCAP.cc apfCAPsizing.cc)
 set(HEADERS apfCAP.h)
 
 #Library
 add_library(apf_cap ${SOURCES})
 target_link_libraries(apf_cap PUBLIC apf gmi_cap)
-target_link_libraries(apf_cap PUBLIC capstone_module
-				     framework_testing)
+target_link_libraries(apf_cap PRIVATE framework_mesh framework_application)
 
 set(CMAKE_CXX_OLD_STANDARD "${CMAKE_CXX_STANDARD}")
 cmake_push_check_state(RESET)
 set(CMAKE_CXX_STANDARD 14)
+
+# CreateFT_Vector.h via CreateMG_SizingMetricTool.h is missing
+# `#include <limits>` in Capstone 12.5.2 so add it explicitly in this check.
+if(MSVC)
+  set(CMAKE_REQUIRED_FLAGS "/FI limits")
+else()
+  set(CMAKE_REQUIRED_FLAGS "-include limits")
+endif()
+
 set(CMAKE_REQUIRED_LIBRARIES "framework_meshing")
-check_include_file_cxx("CreateMG_SizingMetricTool.h" HAVE_CAPSTONE_SIZINGMETRICTOOL)
+check_include_file_cxx(
+  "CreateMG_SizingMetricTool.h" PUMI_HAS_CAPSTONE_SIZINGMETRICTOOL
+)
 cmake_pop_check_state()
 set(CMAKE_CXX_STANDARD "${CMAKE_CXX_OLD_STANDARD}")
 
-if(HAVE_CAPSTONE_SIZINGMETRICTOOL)
-target_compile_definitions(apf_cap PRIVATE HAVE_CAPSTONE_SIZINGMETRICTOOL)
+if(PUMI_HAS_CAPSTONE_SIZINGMETRICTOOL)
+target_compile_definitions(apf_cap PRIVATE PUMI_HAS_CAPSTONE_SIZINGMETRICTOOL)
 target_compile_features(framework_meshing INTERFACE cxx_std_14)
 target_link_libraries(apf_cap PRIVATE framework_meshing)
 endif()