diff --git a/CMakeLists.txt b/CMakeLists.txt index ff7c9be..787a3dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,6 @@ set(POLYHEDRAL_GRAVITY_PARALLELIZATION "CPP" CACHE STRING "Host parallelization (CPP= Serial, OMP = OpenMP, TBB = Intel Threading Building Blocks") set_property(CACHE POLYHEDRAL_GRAVITY_PARALLELIZATION PROPERTY STRINGS CPP, OMP, TBB) -# Enforce to use an already installed tbb library instead of compiling from source -option(USE_LOCAL_TBB "Uses the local tbb installation rather than on using the automatically fetched version from -GitHub via CMake (Default: OFF)" OFF) - # Set the Logging Level set(LOGGING_LEVEL_LIST "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" "OFF") set(LOGGING_LEVEL "INFO" CACHE STRING "Set the Logging level, default (INFO), available options: TRACE, DEBUG, INFO, WARN, ERROR, CRITICAL, OFF") @@ -77,9 +73,9 @@ include(clang_format) # Get a version of tbb from the github repository, simplifies compilation for the user since tbb does not need to be # preinstalled but rather gets automatically set up via CMake # Nevertheless, there is still the option to enforce to use a local installation if one exists -if (NOT USE_LOCAL_TBB AND ${POLYHEDRAL_GRAVITY_PARALLELIZATION} STREQUAL "TBB") +if (${POLYHEDRAL_GRAVITY_PARALLELIZATION} STREQUAL "TBB") include(tbb) - thrust_set_TBB_target(tbb) + thrust_set_TBB_target(TBB::tbb) endif () # Thrust set-up i.e. the parallelization library, create targets according to the users specification diff --git a/README.md b/README.md index 217eec0..194bd1a 100644 --- a/README.md +++ b/README.md @@ -259,7 +259,7 @@ you have a C++17 capable compiler and CMake installed. The project uses the following dependencies, all of them are **automatically** set-up via CMake: -- GoogleTest (1.13.0 or compatible), only required for testing +- GoogleTest (1.15.2 or compatible), only required for testing - spdlog (1.13.0 or compatible), required for logging - tetgen (1.6 or compatible), required for I/O - yaml-cpp (0.8.0 or compatible), required for I/O @@ -309,7 +309,6 @@ The following options are available: |-------------------------------------------:|:--------------------------------------------------------------------------------------------| | POLYHEDRAL_GRAVITY_PARALLELIZATION (`CPP`) | `CPP` = Serial Execution / `OMP` or `TBB` = Parallel Execution with OpenMP or Intel\'s TBB | | LOGGING_LEVEL (`INFO`) | `TRACE`, `DEBUG`, `INFO`, `WARN`, `ERROR`, `CRITICAL`, `OFF` | -| USE_LOCAL_TBB (`OFF`) | Use a local installation of `TBB` instead of setting it up via `CMake` | | BUILD_POLYHEDRAL_GRAVITY_DOCS (`OFF`) | Build this documentation | | BUILD_POLYHEDRAL_GRAVITY_TESTS (`ON`) | Build the Tests | | BUILD_POLYHEDRAL_PYTHON_INTERFACE (`ON`) | Build the Python interface | diff --git a/docs/quickstart/installation.rst b/docs/quickstart/installation.rst index 3ed7545..f529a47 100644 --- a/docs/quickstart/installation.rst +++ b/docs/quickstart/installation.rst @@ -92,7 +92,6 @@ Name (Default) Options ================================================ =================================================================================================================================== POLYHEDRAL_GRAVITY_PARALLELIZATION (:code:`CPP`) :code:`CPP` = Serial Execution / :code:`OMP` or :code:`TBB` = Parallel Execution with OpenMP or Intel's TBB LOGGING_LEVEL (:code:`INFO`) :code:`TRACE`, :code:`DEBUG`, :code:`INFO`, :code:`WARN`, :code:`ERROR`, :code:`CRITICAL`, :code:`OFF` -USE_LOCAL_TBB (:code:`OFF`) Use a local installation of :code:`TBB` instead of setting it up via :code:`CMake` BUILD_POLYHEDRAL_GRAVITY_DOCS (:code:`OFF`) Build this documentation BUILD_POLYHEDRAL_GRAVITY_TESTS (:code:`ON`) Build the Tests BUILD_POLYHEDRAL_PYTHON_INTERFACE (:code:`ON`) Build the Python interface @@ -104,7 +103,7 @@ Dependencies (automatically set-up) Dependencies (all of them are automatically set-up via :code:`CMake`): -- GoogleTest (1.13.0 or compatible), only required for testing +- GoogleTest (1.15.2 or compatible), only required for testing - spdlog (1.13.0 or compatible), required for logging - tetgen (1.6 or compatible), required for I/O - yaml-cpp (0.8.0 or compatible), required for I/O diff --git a/setup.py b/setup.py index 5123228..26cd85f 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,6 @@ "POLYHEDRAL_GRAVITY_PARALLELIZATION": "TBB", # Default value (INFO=2) "LOGGING_LEVEL": "INFO", - # Default value (OFF) - "USE_LOCAL_TBB": "OFF", # Not required for the python interface (--> OFF) "BUILD_POLYHEDRAL_GRAVITY_DOCS": "OFF", # Not required for the python interface (--> OFF) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5875530..08b5bbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,7 @@ if (BUILD_POLYHEDRAL_GRAVITY_LIBRARY) # Link libraries needed in all targets target_link_libraries(${PROJECT_NAME}_lib spdlog::spdlog - yaml-cpp + yaml-cpp::yaml-cpp tetgen xsimd Thrust diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1ea8876..4559a0b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,8 +12,9 @@ add_executable(${PROJECT_NAME}_test ${TEST_SRC}) # Links target breakupModelTest against gtest_main (entry point, so no own main method is required) target_link_libraries(${PROJECT_NAME}_test - gtest_main - gmock + GTest::gtest_main + GTest::gtest + GTest::gmock ${PROJECT_NAME}_lib )