Prepend cache variables for libraries searching with DESKTOP_APP_
To avoid confusion with exports of various cmake packages
This commit is contained in:
parent
1e0b42d295
commit
41ff5e28cd
8 changed files with 24 additions and 24 deletions
12
external/dispatch/CMakeLists.txt
vendored
12
external/dispatch/CMakeLists.txt
vendored
|
|
@ -9,11 +9,11 @@ set(dispatch_prefix ${CMAKE_CURRENT_BINARY_DIR}/dispatch-prefix)
|
|||
set(dispatch_binary_dir ${dispatch_prefix}/src/dispatch-build)
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
find_library(DISPATCH_LIBRARIES dispatch)
|
||||
find_path(DISPATCH_INCLUDE_DIRS dispatch/dispatch.h)
|
||||
find_library(DESKTOP_APP_DISPATCH_LIBRARIES dispatch)
|
||||
find_path(DESKTOP_APP_DISPATCH_INCLUDE_DIRS dispatch/dispatch.h)
|
||||
endif()
|
||||
|
||||
if (NOT DISPATCH_LIBRARIES OR NOT DISPATCH_INCLUDE_DIRS)
|
||||
if (NOT DESKTOP_APP_DISPATCH_LIBRARIES OR NOT DESKTOP_APP_DISPATCH_INCLUDE_DIRS)
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} ${dispatch_loc}
|
||||
-B ${dispatch_binary_dir}
|
||||
|
|
@ -41,9 +41,9 @@ endif()
|
|||
add_library(external_dispatch INTERFACE IMPORTED GLOBAL)
|
||||
add_library(desktop-app::external_dispatch ALIAS external_dispatch)
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED AND DISPATCH_LIBRARIES AND DISPATCH_INCLUDE_DIRS)
|
||||
target_include_directories(external_dispatch SYSTEM INTERFACE ${DISPATCH_INCLUDE_DIRS})
|
||||
target_link_libraries(external_dispatch INTERFACE ${DISPATCH_LIBRARIES})
|
||||
if (DESKTOP_APP_USE_PACKAGED AND DESKTOP_APP_DISPATCH_LIBRARIES AND DESKTOP_APP_DISPATCH_INCLUDE_DIRS)
|
||||
target_include_directories(external_dispatch SYSTEM INTERFACE ${DESKTOP_APP_DISPATCH_INCLUDE_DIRS})
|
||||
target_link_libraries(external_dispatch INTERFACE ${DESKTOP_APP_DISPATCH_LIBRARIES})
|
||||
return()
|
||||
endif()
|
||||
|
||||
|
|
|
|||
4
external/jpeg/CMakeLists.txt
vendored
4
external/jpeg/CMakeLists.txt
vendored
|
|
@ -28,8 +28,8 @@ elseif (APPLE)
|
|||
IMPORTED_LOCATION ${libs_loc}/local/lib/libjpeg.a
|
||||
)
|
||||
else()
|
||||
find_library(JPEG_LIBRARY libjpeg.a REQUIRED)
|
||||
find_library(DESKTOP_APP_JPEG_LIBRARIES libjpeg.a REQUIRED)
|
||||
set_target_properties(external_jpeg PROPERTIES
|
||||
IMPORTED_LOCATION "${JPEG_LIBRARY}"
|
||||
IMPORTED_LOCATION "${DESKTOP_APP_JPEG_LIBRARIES}"
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
4
external/opus/CMakeLists.txt
vendored
4
external/opus/CMakeLists.txt
vendored
|
|
@ -41,8 +41,8 @@ else()
|
|||
INTERFACE
|
||||
/usr/local/include/opus
|
||||
)
|
||||
find_library(OPUS_LIBRARY libopus.a REQUIRED)
|
||||
find_library(DESKTOP_APP_OPUS_LIBRARIES libopus.a REQUIRED)
|
||||
set_target_properties(external_opus PROPERTIES
|
||||
IMPORTED_LOCATION "${OPUS_LIBRARY}"
|
||||
IMPORTED_LOCATION "${DESKTOP_APP_OPUS_LIBRARIES}"
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
10
external/qr_code_generator/CMakeLists.txt
vendored
10
external/qr_code_generator/CMakeLists.txt
vendored
|
|
@ -8,12 +8,12 @@ add_library(external_qr_code_generator INTERFACE IMPORTED GLOBAL)
|
|||
add_library(desktop-app::external_qr_code_generator ALIAS external_qr_code_generator)
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
find_library(QRCODE_LIBRARIES NAMES qrcodegencpp)
|
||||
find_path(QRCODE_INCLUDE_DIRS NAMES qrcodegen.hpp QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen)
|
||||
find_library(DESKTOP_APP_QRCODE_LIBRARIES NAMES qrcodegencpp)
|
||||
find_path(DESKTOP_APP_QRCODE_INCLUDE_DIRS NAMES qrcodegen.hpp QrCode.hpp PATH_SUFFIXES qrcodegencpp qrcodegen)
|
||||
|
||||
if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS)
|
||||
target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${QRCODE_INCLUDE_DIRS})
|
||||
target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES})
|
||||
if (DESKTOP_APP_QRCODE_LIBRARIES AND DESKTOP_APP_QRCODE_INCLUDE_DIRS)
|
||||
target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${DESKTOP_APP_QRCODE_INCLUDE_DIRS})
|
||||
target_link_libraries(external_qr_code_generator INTERFACE ${DESKTOP_APP_QRCODE_LIBRARIES})
|
||||
return()
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
4
external/rnnoise/CMakeLists.txt
vendored
4
external/rnnoise/CMakeLists.txt
vendored
|
|
@ -42,8 +42,8 @@ else()
|
|||
INTERFACE
|
||||
/usr/local/include
|
||||
)
|
||||
find_library(RNNOISE_LIBRARY librnnoise.a REQUIRED)
|
||||
find_library(DESKTOP_APP_RNNOISE_LIBRARIES librnnoise.a REQUIRED)
|
||||
set_target_properties(external_rnnoise PROPERTIES
|
||||
IMPORTED_LOCATION "${RNNOISE_LIBRARY}"
|
||||
IMPORTED_LOCATION "${DESKTOP_APP_RNNOISE_LIBRARIES}"
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
6
external/variant/CMakeLists.txt
vendored
6
external/variant/CMakeLists.txt
vendored
|
|
@ -8,11 +8,11 @@ add_library(external_variant INTERFACE IMPORTED GLOBAL)
|
|||
add_library(desktop-app::external_variant ALIAS external_variant)
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
find_path(VARIANT_INCLUDE_DIRS mapbox/variant.hpp)
|
||||
if (VARIANT_INCLUDE_DIRS)
|
||||
find_path(DESKTOP_APP_VARIANT_INCLUDE_DIRS mapbox/variant.hpp)
|
||||
if (DESKTOP_APP_VARIANT_INCLUDE_DIRS)
|
||||
target_include_directories(external_variant SYSTEM
|
||||
INTERFACE
|
||||
${VARIANT_INCLUDE_DIRS}
|
||||
${DESKTOP_APP_VARIANT_INCLUDE_DIRS}
|
||||
)
|
||||
return()
|
||||
endif()
|
||||
|
|
|
|||
4
external/vpx/CMakeLists.txt
vendored
4
external/vpx/CMakeLists.txt
vendored
|
|
@ -46,8 +46,8 @@ else()
|
|||
INTERFACE
|
||||
/usr/local/include
|
||||
)
|
||||
find_library(VPX_LIBRARY libvpx.a REQUIRED)
|
||||
find_library(DESKTOP_APP_VPX_LIBRARIES libvpx.a REQUIRED)
|
||||
set_target_properties(external_vpx PROPERTIES
|
||||
IMPORTED_LOCATION "${VPX_LIBRARY}"
|
||||
IMPORTED_LOCATION "${DESKTOP_APP_VPX_LIBRARIES}"
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
4
external/zlib/CMakeLists.txt
vendored
4
external/zlib/CMakeLists.txt
vendored
|
|
@ -34,8 +34,8 @@ elseif (APPLE)
|
|||
IMPORTED_LOCATION ${libs_loc}/local/lib/libz.a
|
||||
)
|
||||
else()
|
||||
find_library(ZLIB_LIBRARY libz.a REQUIRED)
|
||||
find_library(DESKTOP_APP_ZLIB_LIBRARIES libz.a REQUIRED)
|
||||
set_target_properties(external_zlib PROPERTIES
|
||||
IMPORTED_LOCATION "${ZLIB_LIBRARY}"
|
||||
IMPORTED_LOCATION "${DESKTOP_APP_ZLIB_LIBRARIES}"
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue