remove THORIN_INSTALL_DEPENDENCIES in favor of thorin_all target

AnyDSL · Jan 15, 2024 · e5813b1 · e5813b1
1 parent c2f8958
commit e5813b1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 option(BUILD_SHARED_LIBS           "Build shared libraries." ON)
 option(THORIN_BUILD_DOCS           "If ON, Thorin will build the documentation (requires Doxygen)." OFF)
 option(THORIN_BUILD_EXAMPLES       "If ON, Thorin will build examples." OFF)
-option(THORIN_INSTALL_DEPENDENCIES "If ON, Thorin's dependencies will be installed alongside Thorin (use when not installing globally)." OFF)
 
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}; shared libs: ${BUILD_SHARED_LIBS}")
 
@@ -42,6 +41,8 @@ else()
     add_compile_options(-Wall -Wextra)
 endif()
 
+add_custom_target(thorin_all)
+
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     find_program(MEMORYCHECK_COMMAND valgrind)
     set(VALGRIND_COMMAND_OPTIONS "--leak-check=full --error-exitcode=1")
@@ -61,19 +62,11 @@ set(ABSL_PROPAGATE_CXX_STD ON)
 set(ABSL_USE_EXTERNAL_GOOGLETEST ON)
 set(ABSL_ENABLE_INSTALL ON)
 set(FE_ABSL ON)
-set(FE_INSTALL_DEPENDENCIES ${THORIN_INSTALL_DEPENDENCIES})
-if(NOT THORIN_INSTALL_DEPENDENCIES)
-    add_subdirectory(external/abseil-cpp EXCLUDE_FROM_ALL)
-    add_subdirectory(external/fe         EXCLUDE_FROM_ALL)
-    add_subdirectory(external/lyra       EXCLUDE_FROM_ALL)
-    add_subdirectory(external/rang       EXCLUDE_FROM_ALL)
-else()
-    add_subdirectory(external/abseil-cpp)
-    add_subdirectory(external/fe)
-    add_subdirectory(external/lyra)
-    add_subdirectory(external/rang)
-endif()
 
+add_subdirectory(external/abseil-cpp)
+add_subdirectory(external/fe)
+add_subdirectory(external/lyra)
+add_subdirectory(external/rang)
 add_subdirectory(src)
 
 if(THORIN_BUILD_EXAMPLES)

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -40,3 +40,5 @@ add_custom_target(docs
         ${DOXY_INDEX_HTML}
         ${INTERNAL_LIST}
 )
+
+add_dependencies(thorin_all docs)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -3,3 +3,5 @@ target_link_libraries(hello PRIVATE libthorin)
 add_dependencies(hello thorin_all_plugins)
 set_target_properties(hello PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/examples")
 install(TARGETS hello EXPORT thorin-targets)
+
+add_dependencies(thorin_all hello)
diff --git a/external/fe b/external/fe
diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt
@@ -34,3 +34,8 @@ gtest_discover_tests(thorin-regex-gtest
     TEST_PREFIX "thorin-regex-gtest."
     DISCOVERY_TIMEOUT 60
 )
+
+add_dependencies(thorin_all
+    thorin-gtest
+    thorin-regex-gtest
+)
diff --git a/src/thorin/CMakeLists.txt b/src/thorin/CMakeLists.txt
@@ -92,3 +92,5 @@ install(
 
 add_subdirectory(cli)
 add_subdirectory(plug)
+
+add_dependencies(thorin_all libthorin)
diff --git a/src/thorin/cli/CMakeLists.txt b/src/thorin/cli/CMakeLists.txt
@@ -2,3 +2,5 @@ add_executable(thorin main.cpp)
 target_link_libraries(thorin libthorin lyra)
 set_target_properties(thorin PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 install(TARGETS thorin EXPORT thorin-targets)
+
+add_dependencies(thorin_all libthorin)
diff --git a/src/thorin/plug/CMakeLists.txt b/src/thorin/plug/CMakeLists.txt
@@ -25,3 +25,5 @@ foreach(PLUGIN ${THORIN_PLUGINS})
     add_dependencies(thorin_all_plugins thorin_${PLUGIN})
     add_dependencies(thorin_${PLUGIN} ${THORIN_INTERNAL_PLUGINS})
 endforeach()
+
+add_dependencies(thorin_all thorin_all_plugins)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -92,3 +92,5 @@ install(

		add_subdirectory(cli)
		add_subdirectory(plug)

		add_dependencies(thorin_all libthorin)