do not add optional targets if we are a subproject

62b563c4 · Heng Liu · Martin Heistermann · 1f36138b · 62b563c4 · 62b563c4
Commit 62b563c4 authored Sep 06, 2019 by Heng Liu Committed by Martin Heistermann Sep 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

CMakeLists.txt CMakeLists.txt +6 -6

src/CMakeLists.txt src/CMakeLists.txt +0 -2

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,10 @@ else()
    set(OVM_STANDALONE_BUILD FALSE)
 endif()

-set(OVM_ENABLE_APPLICATIONS ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh applications in 'all' target")
+set(OVM_ENABLE_APPLICATIONS ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh applications")
 set(OVM_ENABLE_UNITTESTS ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh unit tests")
-set(OVM_ENABLE_EXAMPLES ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh examples in 'all' target")
-set(OVM_BUILD_DOCUMENTATION ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh documentation in 'all' target")
+set(OVM_ENABLE_EXAMPLES ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh examples")
+set(OVM_BUILD_DOCUMENTATION ${OVM_STANDALONE_BUILD} CACHE BOOL "Build OpenVolumeMesh documentation")

 set(OVM_CXX_VERSION 14 CACHE STRING "C++ version to use")
 set_property(CACHE OVM_CXX_VERSION PROPERTY STRINGS 14 17 20)
@@ -42,11 +42,11 @@ add_subdirectory (src)

 if (OVM_ENABLE_EXAMPLES)
    add_subdirectory(examples)
-else()
-    add_subdirectory(examples EXCLUDE_FROM_ALL)
 endif()

-add_subdirectory(documentation)
+if (OVM_BUILD_DOCUMENTATION)
+   add_subdirectory(documentation)
+endif()

 #export(PACKAGE OpenVolumeMesh)


--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -155,8 +155,6 @@ export(PACKAGE OpenVolumeMesh)

 if (OVM_ENABLE_APPLICATIONS)
    add_subdirectory(FileConverter)
-else()
-    add_subdirectory(FileConverter EXCLUDE_FROM_ALL)
 endif()

 if (OVM_ENABLE_UNITTESTS)