CMake update. Python bindings are now optional.

Jaybro · Feb 13, 2021 · c1437b0 · c1437b0
1 parent b522b37
commit c1437b0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,37 +28,38 @@ if(NOT SKBUILD)
         add_subdirectory(examples)
     endif()
 
+    include(CTest)
     find_package(GTest QUIET)
-    if(GTEST_FOUND)
-        include(CTest)
-        message(STATUS "GTest found. Unit test build: ${BUILD_TESTING}.")
-        if(BUILD_TESTING)
+    if(BUILD_TESTING)
+        if (GTEST_FOUND)
             # Tests are dependent on some common code.
             if(NOT TARGET pico_common)
                 add_subdirectory(examples/pico_common)
             endif()
 
             enable_testing()
             add_subdirectory(test/pico_tree)
+            message(STATUS "GTest found. Building unit tests.")
+        else()
+            message(STATUS "GTest not found. Unit tests will not be build.")
         endif()
-    else()
-        message(STATUS "GTest not found. Unit tests will not be build.")
     endif()
 
     find_package(Doxygen QUIET)
-    include(CMakeDependentOption)
-    CMAKE_DEPENDENT_OPTION(BUILD_DOCUMENTATION "Build documentation with Doxygen." ON "DOXYGEN_FOUND" OFF)
-    if(BUILD_DOCUMENTATION)
-        set(DOC_TARGET_NAME ${PROJECT_NAME}_doc)
-        # Hide the internal namespace from the documentation.
-        # set(DOXYGEN_EXCLUDE_SYMBOLS "internal")
+    option(BUILD_DOCS "Build documentation with Doxygen." ON)
+    if(BUILD_DOCS)
+        if(DOXYGEN_FOUND)
+            set(DOC_TARGET_NAME ${PROJECT_NAME}_doc)
+            # Hide the internal namespace from the documentation.
+            # set(DOXYGEN_EXCLUDE_SYMBOLS "internal")
 
-        doxygen_add_docs(
-            ${DOC_TARGET_NAME}
-            src/pico_tree)
+            doxygen_add_docs(
+                ${DOC_TARGET_NAME}
+                src/pico_tree)
 
-        message(STATUS "Doxygen found. Documentation can be build as: make ${DOC_TARGET_NAME}")
-    else()
-        message(STATUS "Doxygen not found. Documentation cannot be build.")
+            message(STATUS "Doxygen found. Documentation can be build as: make ${DOC_TARGET_NAME}")
+        else()
+            message(STATUS "Doxygen not found. Documentation cannot be build.")
+        endif()
     endif()
 endif()
diff --git a/src/pyco_tree/CMakeLists.txt b/src/pyco_tree/CMakeLists.txt
@@ -2,12 +2,14 @@ if(NOT SKBUILD)
     find_package(Python COMPONENTS Interpreter Development QUIET)
     find_package(pybind11 CONFIG QUIET)
     find_package(OpenMP QUIET)
-
-    if (Python_FOUND AND pybind11_FOUND AND OpenMP_FOUND)
-        add_subdirectory(pico_tree)
-        message(STATUS "Python, pybind11 and OpenMP found. Building PycoTree Python Module.")
-    else()
-        message(STATUS "Python, pybind11 or OpenMP not found. PycoTree Python Module skipped.")
+    option(BUILD_BINDINGS "Enable the creation of PicoTree Python bindings." ON)
+    if(BUILD_BINDINGS)
+        if(Python_FOUND AND pybind11_FOUND AND OpenMP_FOUND)
+            add_subdirectory(pico_tree)
+            message(STATUS "Python, pybind11 and OpenMP found. Building PycoTree Python Module.")
+        else()
+            message(STATUS "Python, pybind11 or OpenMP not found. PycoTree Python Module skipped.")
+        endif()
     endif()
 else()
     # scikit-build incorrectly detects Python under MSYS2 / MinGW which it then