Skip to content

Commit

Permalink
biuld optional variant lite cpp20 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ladnir committed Apr 29, 2024
1 parent 2c9b2e6 commit 08eab8a
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions cmake/macoroFindDeps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ macro(FIND_OPTIONAL)

endmacro()

if((MACORO_FETCH_AUTO OR MACORO_FETCH_OPTIONAL) AND MACORO_BUILD)
message("FETCH OPTIONAL")
if(NOT MACORO_FETCH_OPTIONAL)
FIND_OPTIONAL(QUIET)
if(MACORO_OPTIONAL_LITE_V)
if((MACORO_FETCH_AUTO OR MACORO_FETCH_OPTIONAL) AND MACORO_BUILD)
if(NOT MACORO_FETCH_OPTIONAL)
FIND_OPTIONAL(QUIET)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/../thirdparty/getOptionalLite.cmake")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/../thirdparty/getOptionalLite.cmake")
endif()

if(MACORO_OPTIONAL_LITE_V)
message("FIND OPTIONAL")
FIND_OPTIONAL(REQUIRED)
endif()

Expand All @@ -55,14 +53,15 @@ macro(FIND_VARIANT)

endmacro()

if((MACORO_FETCH_AUTO OR MACORO_FETCH_OPTIONAL) AND MACORO_BUILD)
if(NOT MACORO_FETCH_VARIANT)
FIND_VARIANT(QUIET)
if(MACORO_VARIANT_LITE_V)
if((MACORO_FETCH_AUTO OR MACORO_FETCH_OPTIONAL) AND MACORO_BUILD)
if(NOT MACORO_FETCH_VARIANT)
FIND_VARIANT(QUIET)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/../thirdparty/getVariantLite.cmake")
endif()

include("${CMAKE_CURRENT_LIST_DIR}/../thirdparty/getVariantLite.cmake")
endif()
if(MACORO_VARIANT_LITE_V)
FIND_VARIANT(REQUIRED)
endif()

Expand Down

0 comments on commit 08eab8a

Please sign in to comment.