Skip to content

Commit fbe52c2

Browse files
authored
Merge pull request #486 from SCOREC/apw/capAdapt
Add capAdapt test utility and framework_meshing C++14 requirement
2 parents 8eabb61 + fc4cc56 commit fbe52c2

File tree

3 files changed

+574
-1
lines changed

3 files changed

+574
-1
lines changed

apf_cap/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ set(CMAKE_CXX_STANDARD "${CMAKE_CXX_OLD_STANDARD}")
3131

3232
if(HAVE_CAPSTONE_SIZINGMETRICTOOL)
3333
target_compile_definitions(apf_cap PRIVATE HAVE_CAPSTONE_SIZINGMETRICTOOL)
34+
target_compile_features(framework_meshing INTERFACE cxx_std_14)
3435
target_link_libraries(apf_cap PRIVATE framework_meshing)
35-
target_compile_features(apf_cap PRIVATE cxx_std_14)
3636
endif()
3737

3838
include(GNUInstallDirs)

test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ if(ENABLE_CAPSTONE)
220220
util_exe_func(cap2vtk cap2vtk.cc)
221221
util_exe_func(capGeomTest capGeomTest.cc)
222222
util_exe_func(capCheckParam capCheckParam.cc)
223+
util_exe_func(capAdapt capAdapt.cc)
224+
target_link_libraries(capAdapt framework_meshing)
223225
endif()
224226

225227
# send all the newly added utility executable targets

0 commit comments

Comments
 (0)