Skip to content

Commit

Permalink
Improve cmake-variables naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@ngrodzitski
ngrodzitski committed Nov 10, 2023
1 parent b768441 commit d211010
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
46 changes: 23 additions & 23 deletions dev/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,31 +78,31 @@ message(STATUS "RESTINIO_WITH_SOBJECTIZER: ${RESTINIO_WITH_SOBJECTIZER}")
# * local - Rely on local sources of the dependency.

# By default we assume to use an embedded version of ASIO.
set(RESTINIO_DEPENDENCY_RESOLVE_HINT_STANDALONE_ASIO "find_package" CACHE STRING "How to get ASIO dependency)")
set_property(CACHE RESTINIO_DEPENDENCY_RESOLVE_HINT_STANDALONE_ASIO PROPERTY STRINGS "system;find_package")
set(RESTINIO_DEP_STANDALONE_ASIO "find_package" CACHE STRING "How to get ASIO dependency)")
set_property(CACHE RESTINIO_DEP_STANDALONE_ASIO PROPERTY STRINGS "system;find_package")

# By default we assume to use Boost::asio other than system.
# to be more specific we will assume that find_package would do it.
set(RESTINIO_DEPENDENCY_RESOLVE_HINT_BOOST_ASIO "find_package" CACHE STRING "How to get Boost.ASIO dependency)")
set_property(CACHE RESTINIO_DEPENDENCY_RESOLVE_HINT_BOOST_ASIO PROPERTY STRINGS "system;find_package")
set(RESTINIO_DEP_BOOST_ASIO "find_package" CACHE STRING "How to get Boost.ASIO dependency)")
set_property(CACHE RESTINIO_DEP_BOOST_ASIO PROPERTY STRINGS "system;find_package")

# By default we assume to use an embedded version of LLHTTP.
set(RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP "local" CACHE STRING "How to get llhttp (http parser) dependency)")
set_property(CACHE RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP PROPERTY STRINGS "system;find_package;local")
set(RESTINIO_DEP_LLHTTP "local" CACHE STRING "How to get llhttp (http parser) dependency)")
set_property(CACHE RESTINIO_DEP_LLHTTP PROPERTY STRINGS "system;find_package;local")

# By default we assume to use an embedded version of FMT.
set(RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT "local" CACHE STRING "How to get FMT dependency)")
set_property(CACHE RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT PROPERTY STRINGS "system;find_package;local")
set(RESTINIO_DEP_FMT "local" CACHE STRING "How to get FMT dependency)")
set_property(CACHE RESTINIO_DEP_FMT PROPERTY STRINGS "system;find_package;local")

# By default we assume to use an embedded version of expected-lite.
set(RESTINIO_DEPENDENCY_RESOLVE_HINT_EXPECTED_LITE "local" CACHE STRING "How to get expected-lite dependency)")
set_property(CACHE RESTINIO_DEPENDENCY_RESOLVE_HINT_EXPECTED_LITE PROPERTY STRINGS "system;find_package;local")
set(RESTINIO_DEP_EXPECTED_LITE "local" CACHE STRING "How to get expected-lite dependency)")
set_property(CACHE RESTINIO_DEP_EXPECTED_LITE PROPERTY STRINGS "system;find_package;local")

message(STATUS "RESTINIO_DEPENDENCY_RESOLVE_HINT_STANDALONE_ASIO: ${RESTINIO_DEPENDENCY_RESOLVE_HINT_STANDALONE_ASIO}")
message(STATUS "RESTINIO_DEPENDENCY_RESOLVE_HINT_BOOST_ASIO: ${RESTINIO_DEPENDENCY_RESOLVE_HINT_BOOST_ASIO}")
message(STATUS "RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP: ${RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP}")
message(STATUS "RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT: ${RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT}")
message(STATUS "RESTINIO_DEPENDENCY_RESOLVE_HINT_EXPECTED_LITE: ${RESTINIO_DEPENDENCY_RESOLVE_HINT_EXPECTED_LITE}")
message(STATUS "RESTINIO_DEP_STANDALONE_ASIO: ${RESTINIO_DEP_STANDALONE_ASIO}")
message(STATUS "RESTINIO_DEP_BOOST_ASIO: ${RESTINIO_DEP_BOOST_ASIO}")
message(STATUS "RESTINIO_DEP_LLHTTP: ${RESTINIO_DEP_LLHTTP}")
message(STATUS "RESTINIO_DEP_FMT: ${RESTINIO_DEP_FMT}")
message(STATUS "RESTINIO_DEP_EXPECTED_LITE: ${RESTINIO_DEP_EXPECTED_LITE}")

set(RESTINIO_ASIO_SOURCE "standalone" CACHE STRING "What source of ASIO to use (standalone, boost)")
set(RESTINIO_ASIO_SOURCE_VALUES "standalone;boost")
Expand Down Expand Up @@ -137,7 +137,7 @@ message(STATUS "Defining RESTinio dependencies...")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")

if (RESTINIO_ASIO_SOURCE STREQUAL "standalone")
if (RESTINIO_DEPENDENCY_RESOLVE_HINT_STANDALONE_ASIO STREQUAL "find_package")
if (RESTINIO_DEP_STANDALONE_ASIO STREQUAL "find_package")
message(STATUS "Finding ASIO package...")
set(RESTINIO_ASIO_PATH_HINT ${CMAKE_CURRENT_SOURCE_DIR}/asio)
find_package(asio REQUIRED)
Expand All @@ -146,33 +146,33 @@ if (RESTINIO_ASIO_SOURCE STREQUAL "standalone")
endif()
endif ()
else ()
if (RESTINIO_DEPENDENCY_RESOLVE_HINT_BOOST_ASIO STREQUAL "find_package")
if (RESTINIO_DEP_BOOST_ASIO STREQUAL "find_package")
find_package(Boost REQUIRED)
find_package(Boost REQUIRED COMPONENTS headers regex)
endif ()
endif ()

if (RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP STREQUAL "find_package")
if (RESTINIO_DEP_LLHTTP STREQUAL "find_package")
find_package(llhttp REQUIRED)
elseif (RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP STREQUAL "local")
elseif (RESTINIO_DEP_LLHTTP STREQUAL "local")
message("========================================")
message(STATUS "Add subdirectory nodejs/llhttp")
add_subdirectory(nodejs/llhttp)
message("========================================")
endif ()

if (RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT STREQUAL "find_package")
if (RESTINIO_DEP_FMT STREQUAL "find_package")
find_package(fmt REQUIRED)
elseif (RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT STREQUAL "local")
elseif (RESTINIO_DEP_FMT STREQUAL "local")
message("========================================")
message(STATUS "Add subdirectory fmt")
add_subdirectory(fmt)
message("========================================")
endif ()

if (RESTINIO_DEPENDENCY_RESOLVE_HINT_EXPECTED_LITE STREQUAL "find_package")
if (RESTINIO_DEP_EXPECTED_LITE STREQUAL "find_package")
find_package(expected-lite REQUIRED)
elseif (RESTINIO_DEPENDENCY_RESOLVE_HINT_EXPECTED_LITE STREQUAL "local")
elseif (RESTINIO_DEP_EXPECTED_LITE STREQUAL "local")
message("========================================")
message(STATUS "Add subdirectory expected-lite")
add_subdirectory(expected-lite)
Expand Down
10 changes: 5 additions & 5 deletions dev/restinio/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ endif()
# --------------------------------------------------------------------
# Handle ASIO dependency.
if (RESTINIO_ASIO_SOURCE STREQUAL "standalone")
if (RESTINIO_DEPENDENCY_RESOLVE_HINT_STANDALONE_ASIO STREQUAL "system")
if (RESTINIO_DEP_STANDALONE_ASIO STREQUAL "system")
message(STATUS "${RESTINIO_LIBRARY_NAME} target assumes standalone asio is available in system headers")
elseif (TARGET asio::asio)
target_link_libraries(${RESTINIO_LIBRARY_NAME} INTERFACE asio::asio)
Expand All @@ -61,7 +61,7 @@ if (RESTINIO_ASIO_SOURCE STREQUAL "standalone")
"Giving up...")
endif()
elseif (RESTINIO_ASIO_SOURCE STREQUAL "boost")
if (RESTINIO_DEPENDENCY_RESOLVE_HINT_BOOST_ASIO STREQUAL "system")
if (RESTINIO_DEP_BOOST_ASIO STREQUAL "system")
message(STATUS "${RESTINIO_LIBRARY_NAME} target assumes Boost::asio is available in system headers")
elseif (TARGET Boost::headers)
target_link_libraries(${RESTINIO_LIBRARY_NAME} INTERFACE Boost::headers)
Expand All @@ -86,7 +86,7 @@ endif ()

# --------------------------------------------------------------------
# Handle LLHTTP dependency.
if (RESTINIO_DEPENDENCY_RESOLVE_HINT_LLHTTP STREQUAL "system")
if (RESTINIO_DEP_LLHTTP STREQUAL "system")
message(STATUS "Using system llhttp")
if (RESTINIO_LLHTTP_LIB_LINK_NAME)
message(STATUS "Using system llhttp with linking to custom lib name: ${RESTINIO_LLHTTP_LIB_LINK_NAME}")
Expand All @@ -112,7 +112,7 @@ endif()

# --------------------------------------------------------------------
# Handle FMT dependency.
if (RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT STREQUAL "system")
if (RESTINIO_DEP_FMT STREQUAL "system")
if (RESTINIO_FMT_LIB_LINK_NAME)
message(STATUS "Using system fmt with linking to ${RESTINIO_FMT_LIB_LINK_NAME}")
# target_compile_definitions(${RESTINIO_LIBRARY_NAME} INTERFACE FMT_HEADER_ONLY=0 )
Expand Down Expand Up @@ -146,7 +146,7 @@ if ("${RESTINIO_EXPLICIT_CPPSTD}" STREQUAL "17"
# conditional block.
endif()

if (RESTINIO_DEPENDENCY_RESOLVE_HINT_FMT STREQUAL "system")
if (RESTINIO_DEP_FMT STREQUAL "system")
message(STATUS "Using system expected-lite")
elseif (TARGET expected-lite::expected-lite)
target_link_libraries(${RESTINIO_LIBRARY_NAME} INTERFACE expected-lite::expected-lite)
Expand Down

0 comments on commit d211010

Please sign in to comment.