Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ if(JOIN_ENABLE_DATA)
endif()

if(JOIN_ENABLE_FABRIC)
if(NOT JOIN_ENABLE_CRYPTO)
message(FATAL_ERROR "JOIN_ENABLE_FABRIC requires JOIN_ENABLE_CRYPTO")
endif()
add_subdirectory(fabric)
endif()

Expand Down
35 changes: 9 additions & 26 deletions cmake/joinConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
include(CMakeFindDependencyMacro)

find_dependency(Threads)
find_dependency(OpenSSL)

if(@JOIN_ENABLE_CRYPTO@)
find_dependency(OpenSSL)
endif()

set(join_KNOWN_COMPONENTS core crypto data fabric services)

Expand All @@ -19,7 +22,7 @@ foreach(comp ${join_FIND_COMPONENTS})
endif()
endforeach()

if("data" IN_LIST join_FIND_COMPONENTS AND @JOIN_ENABLE_DATA@)
if(@JOIN_ENABLE_DATA@ OR @JOIN_ENABLE_SERVICES@)
find_dependency(ZLIB)
endif()

Expand Down Expand Up @@ -50,31 +53,11 @@ endif()
set(_join_missing_components "")

foreach(comp ${join_FIND_COMPONENTS})
string(TOUPPER ${comp} comp_upper)

if(NOT TARGET join::${comp})
if(comp STREQUAL "core")
# Core should always exist
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
elseif(comp STREQUAL "crypto" AND NOT @JOIN_ENABLE_CRYPTO@)
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
elseif(comp STREQUAL "data" AND NOT @JOIN_ENABLE_DATA@)
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
elseif(comp STREQUAL "fabric" AND NOT @JOIN_ENABLE_FABRIC@)
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
elseif(comp STREQUAL "services" AND NOT @JOIN_ENABLE_SERVICES@)
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
else()
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
endif()
else()
if(TARGET join::${comp})
set(join_${comp}_FOUND TRUE)
else()
list(APPEND _join_missing_components ${comp})
set(join_${comp}_FOUND FALSE)
endif()
endforeach()

Expand Down
Loading