|
 |
1167118 |
--- a/CMakeLists.txt
|
|
|
1167118 |
+++ b/CMakeLists.txt
|
|
|
8ac66df |
@@ -106,7 +106,7 @@ find_package(Protobuf REQUIRED)
|
|
|
1167118 |
find_package(ZLIB REQUIRED)
|
|
|
1167118 |
find_package(Unwind)
|
|
|
1167118 |
|
|
|
8ac66df |
-if(DISABLE_VCPKG)
|
|
|
8ac66df |
+if(DISABLE_VCPKG AND NOT USE_SYSTEM_PKGS)
|
|
|
8ac66df |
add_subdirectory(${EXTERNAL_DIR}/Catch2)
|
|
|
8ac66df |
add_subdirectory(${EXTERNAL_DIR}/cxxopts)
|
|
|
8ac66df |
add_subdirectory(${EXTERNAL_DIR}/cpp-httplib)
|
|
|
8ac66df |
@@ -118,11 +118,29 @@ include_directories(
|
|
|
8ac66df |
${EXTERNAL_DIR}/cxxopts/include
|
|
|
8ac66df |
)
|
|
|
8ac66df |
else()
|
|
|
8ac66df |
-find_package(Catch2 CONFIG REQUIRED)
|
|
|
8ac66df |
+if (NOT DISABLE_VCPKG)
|
|
|
8ac66df |
+ find_package(Catch2 CONFIG REQUIRED)
|
|
|
8ac66df |
+endif()
|
|
|
8ac66df |
find_package(httplib CONFIG REQUIRED)
|
|
|
8ac66df |
find_package(cxxopts CONFIG REQUIRED)
|
|
|
8ac66df |
find_package(nlohmann_json CONFIG REQUIRED)
|
|
|
8ac66df |
-find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c")
|
|
|
8ac66df |
+endif()
|
|
|
1167118 |
+
|
|
|
8ac66df |
+if(USE_SYSTEM_PKGS)
|
|
|
8ac66df |
+# Fedora's Catch2 is too old
|
|
|
8ac66df |
+# nlohmann_json packaging is broken
|
|
|
8ac66df |
+# simpleini system package does not ship ConvertUTF.{c,h}
|
|
|
8ac66df |
+add_subdirectory(${EXTERNAL_DIR}/Catch2)
|
|
|
8ac66df |
+include_directories(
|
|
|
8ac66df |
+ ${EXTERNAL_DIR}/simpleini
|
|
|
8ac66df |
+ ${INCLUDE_INSTALL_DIR}/nlohmann
|
|
|
8ac66df |
+)
|
|
|
1167118 |
+
|
|
|
8ac66df |
+get_cmake_property(_variableNames VARIABLES)
|
|
|
8ac66df |
+list (SORT _variableNames)
|
|
|
8ac66df |
+foreach (_variableName ${_variableNames})
|
|
|
8ac66df |
+ message(STATUS "${_variableName}=${${_variableName}}")
|
|
|
8ac66df |
+endforeach()
|
|
|
8ac66df |
endif()
|
|
|
8ac66df |
|
|
|
1167118 |
# Optional packages
|
|
|
8ac66df |
@@ -353,7 +371,6 @@ macro(DECORATE_FUZZER TARGET_NAME)
|
|
|
1167118 |
endmacro()
|
|
|
1167118 |
|
|
|
1167118 |
include_directories(
|
|
|
1167118 |
- ${EXTERNAL_DIR}/easyloggingpp/src
|
|
|
1167118 |
${EXTERNAL_DIR}/PlatformFolders
|
|
|
8ac66df |
${EXTERNAL_DIR}/ThreadPool
|
|
|
1167118 |
${EXTERNAL_DIR}/sole
|
|
|
8ac66df |
@@ -381,8 +398,8 @@ endif()
|
|
|
1167118 |
add_library(
|
|
|
1167118 |
et-lib STATIC
|
|
|
1167118 |
|
|
|
1167118 |
- ${EXTERNAL_DIR}/easyloggingpp/src/easylogging++.h
|
|
|
1167118 |
- ${EXTERNAL_DIR}/easyloggingpp/src/easylogging++.cc
|
|
|
1167118 |
+ ${INCLUDE_INSTALL_DIR}/easylogging++.h
|
|
|
1167118 |
+ ${INCLUDE_INSTALL_DIR}/easylogging++.cc
|
|
|
1167118 |
${EXTERNAL_DIR}/PlatformFolders/sago/platform_folders.cpp
|
|
|
1167118 |
|
|
|
1167118 |
src/base/BackedReader.hpp
|