Addendum 8

Author: michizhou

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.8)
 project(fish_deformation)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -107,30 +107,16 @@ target_include_directories(quartet PUBLIC ${QUARTET_INCLUDE_DIRS})
 
 
 # ContourTree static library
-find_package(OpenMP REQUIRED)
-if(NOT TARGET OpenMP::OpenMP_CXX)
-    add_library(OpenMP_TARGET INTERFACE)
-    add_library(OpenMP::OpenMP_CXX ALIAS OpenMP_TARGET)
-    target_compile_options(OpenMP_TARGET INTERFACE ${OpenMP_CXX_FLAGS})
-    find_package(Threads REQUIRED)
-    target_link_libraries(OpenMP_TARGET INTERFACE Threads::Threads)
-    target_link_libraries(OpenMP_TARGET INTERFACE ${OpenMP_CXX_FLAGS})
-endif()
 file(GLOB CT_SRCS external/Segmentangling/ContourTree/*.cpp)
 set(CT_INCLUDE_DIRS external/Segmentangling/ContourTree)
 list(REMOVE_ITEM CT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/external/Segmentangling/ContourTree/main.cpp")
-# if (APPLE)
-#   list(REMOVE_ITEM CT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/external/Segmentangling/ContourTree/MergeTree.cpp")
-# endif ()
 add_library(contourtree STATIC ${CT_SRCS})
-# if (NOT APPLE)
-#   target_compile_options(contourtree PRIVATE "-fopenmp")
-#   target_link_libraries(contourtree Qt5::Core Qt5::Widgets -fopenmp spdlog)
-# else ()
-#   target_link_libraries(contourtree Qt5::Core Qt5::Widgets spdlog)
-# endif ()
-target_compile_options(contourtree PRIVATE "-fopenmp")
-target_link_libraries(contourtree Qt5::Core Qt5::Widgets -fopenmp spdlog OpenMP::OpenMP_CXX)
+if (NOT APPLE)
+  target_compile_options(contourtree PRIVATE "-fopenmp")
+  target_link_libraries(contourtree Qt5::Core Qt5::Widgets -fopenmp spdlog)
+else ()
+  target_link_libraries(contourtree Qt5::Core Qt5::Widgets spdlog)
+endif ()
 target_include_directories(contourtree PUBLIC ${CT_INCLUDE_DIRS})
 target_compile_definitions(contourtree PUBLIC CONTOUR_TREE_USE_SPDLOG)