2021-08-02 10:35:57 +02:00
|
|
|
--- a/cmake/external/expected/CMakeLists.txt
|
|
|
|
+++ b/cmake/external/expected/CMakeLists.txt
|
2020-08-31 01:56:14 +02:00
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
add_library(external_expected INTERFACE IMPORTED GLOBAL)
|
|
|
|
add_library(desktop-app::external_expected ALIAS external_expected)
|
|
|
|
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
|
|
find_package(tl-expected QUIET)
|
|
|
|
else()
|
2021-08-02 10:35:57 +02:00
|
|
|
--- a/cmake/external/gsl/CMakeLists.txt
|
|
|
|
+++ b/cmake/external/gsl/CMakeLists.txt
|
2020-08-31 01:56:14 +02:00
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
add_library(external_gsl INTERFACE IMPORTED GLOBAL)
|
|
|
|
add_library(desktop-app::external_gsl ALIAS external_gsl)
|
|
|
|
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
|
|
find_package(Microsoft.GSL QUIET)
|
|
|
|
else()
|
2021-08-02 10:35:57 +02:00
|
|
|
--- a/cmake/external/ranges/CMakeLists.txt
|
|
|
|
+++ b/cmake/external/ranges/CMakeLists.txt
|
2020-08-31 01:56:14 +02:00
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
add_library(external_ranges INTERFACE IMPORTED GLOBAL)
|
|
|
|
add_library(desktop-app::external_ranges ALIAS external_ranges)
|
|
|
|
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
|
|
find_package(range-v3 QUIET)
|
|
|
|
else()
|
|
|
|
@@ -32,4 +32,4 @@ if (NOT range-v3_FOUND)
|
|
|
|
/wd5105 # needed for `/Zc:preprocessor`, suppressing C5105 "macro expansion producing 'defined' has undefined behavior"
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
-endif()
|
|
|
|
\ No newline at end of file
|
|
|
|
+endif()
|
2021-08-02 10:35:57 +02:00
|
|
|
--- a/cmake/external/webrtc/CMakeLists.txt
|
|
|
|
+++ b/cmake/external/webrtc/CMakeLists.txt
|
2020-10-02 18:39:31 +02:00
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
|
|
|
|
add_library(desktop-app::external_webrtc ALIAS external_webrtc)
|
|
|
|
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
|
|
find_package(tg_owt REQUIRED)
|
|
|
|
target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
|
|
|
|
else()
|
2021-08-02 10:35:57 +02:00
|
|
|
--- a/cmake/external/rlottie/CMakeLists.txt
|
|
|
|
+++ b/cmake/external/rlottie/CMakeLists.txt
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
add_library(external_rlottie INTERFACE IMPORTED GLOBAL)
|
|
|
|
add_library(desktop-app::external_rlottie ALIAS external_rlottie)
|
|
|
|
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
|
|
find_package(rlottie QUIET)
|
|
|
|
|
|
|
|
if (rlottie_FOUND)
|