bugfix

Author: mgroncki

CMakeLists.txt

@@ -170,7 +170,6 @@ if (NOT DEFINED THREADS_PREFER_PTHREAD_FLAG)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
 endif()
 
-#QL1.29 MergeConflict theirs
 # Add Threads dependency when any of the threading features are enabled
 if (QL_ENABLE_PARALLEL_UNIT_TEST_RUNNER OR QL_ENABLE_SESSIONS OR QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN)
     find_package(Threads REQUIRED)
@@ -181,11 +180,6 @@ if (QL_ENABLE_PARALLEL_UNIT_TEST_RUNNER OR QL_ENABLE_SESSIONS OR QL_ENABLE_THREA
     else()
         set(QL_THREAD_LIBRARIES Threads::Threads)
     endif()
-set(QL_THREAD_LIBRARIES)
-# QL1.29 MergeConflict ours
-# Parallel test runner needs library rt on *nix for shm_open, etc.
-#if (QL_ENABLE_PARALLEL_UNIT_TEST_RUNNER AND UNIX AND NOT APPLE)
-#    find_library(RT_LIBRARY rt REQUIRED)
 endif()
 
 # If available, use PIC for shared libs and PIE for executables

test-suite/CMakeLists.txt

@@ -381,10 +381,6 @@ if (QL_BUILD_TEST_SUITE)
     target_link_libraries(ql_test_suite PRIVATE
         ql_library
         ql_unit_test_main
-    #QL1.29 MergeConflict ours
-        #Boost::unit_test_framework
-        #${QL_TEST_SUITE_LIBRARIES})
-    # QL1.29 MergeConflict theirs
         ${QL_THREAD_LIBRARIES})
     if(MSVC AND CMAKE_UNITY_BUILD)
         # for Unity builds, we need to add /bigobj
@@ -408,17 +404,13 @@ IF (QL_BUILD_BENCHMARK)
     endif()
     target_link_libraries(ql_benchmark PRIVATE
         ql_library
-    #QL1.29 MergeConflict theirs
         ql_unit_test_main
         ${QL_THREAD_LIBRARIES})
     if(MSVC AND CMAKE_UNITY_BUILD)
         # for Unity builds, we need to add /bigobj
         target_compile_options(ql_benchmark PRIVATE "/bigobj")
     endif()
-    #QL1.29 MergeConflict ours
-    #Boost::unit_test_framework
-    #{QL_BENCHMARK_LIBRARIES})
     if (QL_INSTALL_BENCHMARK)
         install(TARGETS ql_benchmark RUNTIME DESTINATION ${QL_INSTALL_BINDIR})
     endif()
-endif()
+endif()