Use absolute paths instead of target_link_directories.
This commit is contained in:
parent
52eaa9cd61
commit
b28ca5aca2
6 changed files with 57 additions and 79 deletions
7
external/auto_updates/lzma/CMakeLists.txt
vendored
7
external/auto_updates/lzma/CMakeLists.txt
vendored
|
|
@ -12,12 +12,9 @@ INTERFACE
|
|||
${libs_loc}/lzma/C
|
||||
)
|
||||
|
||||
target_link_directories(external_lzma
|
||||
INTERFACE
|
||||
${libs_loc}/lzma/C/Util/LzmaLib/$<IF:$<CONFIG:Debug>,Debug,Release>
|
||||
)
|
||||
set(lzma_lib_loc ${libs_loc}/lzma/C/Util/LzmaLib/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
|
||||
target_link_libraries(external_lzma
|
||||
INTERFACE
|
||||
LzmaLib
|
||||
${lzma_lib_loc}/LzmaLib.lib
|
||||
)
|
||||
|
|
|
|||
13
external/crash_reports/breakpad/CMakeLists.txt
vendored
13
external/crash_reports/breakpad/CMakeLists.txt
vendored
|
|
@ -12,14 +12,11 @@ INTERFACE
|
|||
${libs_loc}/breakpad/src
|
||||
)
|
||||
|
||||
set(breakpad_lib_loc ${libs_loc}/breakpad/src/out/$<IF:$<CONFIG:Debug>,Debug,Release>/obj/client)
|
||||
|
||||
target_link_libraries(external_breakpad
|
||||
INTERFACE
|
||||
windows/common
|
||||
windows/handler/exception_handler
|
||||
windows/crash_generation/crash_generation_client
|
||||
)
|
||||
|
||||
target_link_directories(external_breakpad
|
||||
INTERFACE
|
||||
${libs_loc}/breakpad/src/out/$<IF:$<CONFIG:Debug>,Debug,Release>/obj/client
|
||||
${breakpad_lib_loc}/windows/common.lib
|
||||
${breakpad_lib_loc}/windows/handler/exception_handler.lib
|
||||
${breakpad_lib_loc}/windows/crash_generation/crash_generation_client.lib
|
||||
)
|
||||
|
|
|
|||
23
external/openssl/CMakeLists.txt
vendored
23
external/openssl/CMakeLists.txt
vendored
|
|
@ -13,26 +13,17 @@ INTERFACE
|
|||
)
|
||||
|
||||
if (WIN32)
|
||||
target_link_directories(external_openssl
|
||||
INTERFACE
|
||||
${libs_loc}/openssl_1_1_1/out32$<$<CONFIG:Debug>:.dbg>
|
||||
)
|
||||
target_link_libraries(external_openssl
|
||||
INTERFACE
|
||||
libcrypto
|
||||
libssl
|
||||
)
|
||||
set(openssl_lib_ext lib)
|
||||
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out32$<$<CONFIG:Debug>:.dbg>)
|
||||
else()
|
||||
set(openssl_lib_ext a)
|
||||
if (APPLE)
|
||||
target_link_directories(external_openssl
|
||||
INTERFACE
|
||||
${libs_loc}/openssl_1_1_1
|
||||
)
|
||||
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
target_link_libraries(external_openssl
|
||||
INTERFACE
|
||||
crypto
|
||||
ssl
|
||||
${openssl_lib_loc}/libcrypto.${openssl_lib_ext}
|
||||
${openssl_lib_loc}/libssl.${openssl_lib_ext}
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
7
external/opus/CMakeLists.txt
vendored
7
external/opus/CMakeLists.txt
vendored
|
|
@ -13,14 +13,11 @@ INTERFACE
|
|||
)
|
||||
|
||||
if (WIN32)
|
||||
target_link_directories(external_opus
|
||||
INTERFACE
|
||||
${libs_loc}/opus/win32/VS2015/Win32/$<IF:$<CONFIG:Debug>,Debug,Release>
|
||||
)
|
||||
set(opus_lib_loc ${libs_loc}/opus/win32/VS2015/Win32/$<IF:$<CONFIG:Debug>,Debug,Release>)
|
||||
|
||||
target_link_libraries(external_opus
|
||||
INTERFACE
|
||||
opus
|
||||
${opus_lib_loc}/opus.lib
|
||||
)
|
||||
elseif (APPLE AND NOT build_osx)
|
||||
target_link_libraries(external_opus
|
||||
|
|
|
|||
73
external/qt/CMakeLists.txt
vendored
73
external/qt/CMakeLists.txt
vendored
|
|
@ -38,52 +38,60 @@ INTERFACE
|
|||
QT_CORE_LIB
|
||||
)
|
||||
|
||||
if (WIN32)
|
||||
set(qt_lib_prefix "")
|
||||
set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib)
|
||||
else()
|
||||
set(qt_lib_prefix lib)
|
||||
set(qt_lib_suffix $<$<CONFIG:Debug>:_debug>.a)
|
||||
endif()
|
||||
|
||||
set(common_qt_libs
|
||||
qwebp
|
||||
qgif
|
||||
qjpeg
|
||||
Qt5PrintSupport
|
||||
Qt5AccessibilitySupport
|
||||
Qt5FontDatabaseSupport
|
||||
Qt5EventDispatcherSupport
|
||||
Qt5ThemeSupport
|
||||
Qt5Network
|
||||
Qt5Widgets
|
||||
Qt5Gui
|
||||
qtharfbuzz
|
||||
qtlibpng
|
||||
plugins/imageformats/${qt_lib_prefix}qwebp
|
||||
plugins/imageformats/${qt_lib_prefix}qgif
|
||||
plugins/imageformats/${qt_lib_prefix}qjpeg
|
||||
lib/${qt_lib_prefix}Qt5PrintSupport
|
||||
lib/${qt_lib_prefix}Qt5AccessibilitySupport
|
||||
lib/${qt_lib_prefix}Qt5FontDatabaseSupport
|
||||
lib/${qt_lib_prefix}Qt5EventDispatcherSupport
|
||||
lib/${qt_lib_prefix}Qt5ThemeSupport
|
||||
lib/${qt_lib_prefix}Qt5Network
|
||||
lib/${qt_lib_prefix}Qt5Widgets
|
||||
lib/${qt_lib_prefix}Qt5Gui
|
||||
lib/${qt_lib_prefix}qtharfbuzz
|
||||
lib/${qt_lib_prefix}qtlibpng
|
||||
)
|
||||
|
||||
set(qt_libs_list "")
|
||||
if (WIN32)
|
||||
set(qt_libs
|
||||
${common_qt_libs}
|
||||
Qt5Core
|
||||
Qt5WindowsUIAutomationSupport
|
||||
qtmain
|
||||
qwindows
|
||||
qtfreetype
|
||||
qtpcre2
|
||||
lib/${qt_lib_prefix}Qt5Core
|
||||
lib/${qt_lib_prefix}Qt5WindowsUIAutomationSupport
|
||||
lib/${qt_lib_prefix}qtmain
|
||||
lib/${qt_lib_prefix}qtfreetype
|
||||
lib/${qt_lib_prefix}qtpcre2
|
||||
plugins/platforms/${qt_lib_prefix}qwindows
|
||||
)
|
||||
foreach (lib ${qt_libs})
|
||||
list(APPEND qt_libs_list "${lib}$<$<CONFIG:Debug>:d>")
|
||||
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
|
||||
endforeach()
|
||||
elseif (APPLE)
|
||||
if (NOT build_osx)
|
||||
set(qt_libs
|
||||
${common_qt_libs}
|
||||
Qt5Core
|
||||
Qt5GraphicsSupport
|
||||
Qt5ClipboardSupport
|
||||
qgenericbearer
|
||||
qtfreetype
|
||||
qtpcre2
|
||||
qcocoa
|
||||
lib/${qt_lib_prefix}Qt5Core
|
||||
lib/${qt_lib_prefix}Qt5GraphicsSupport
|
||||
lib/${qt_lib_prefix}Qt5ClipboardSupport
|
||||
lib/${qt_lib_prefix}qtfreetype
|
||||
lib/${qt_lib_prefix}qtpcre2
|
||||
plugins/platforms/${qt_lib_prefix}qcocoa
|
||||
plugins/bearer/${qt_lib_prefix}qgenericbearer
|
||||
)
|
||||
else()
|
||||
endif()
|
||||
foreach (lib ${qt_libs})
|
||||
list(APPEND qt_libs_list "${lib}$<$<CONFIG:Debug>:_debug>")
|
||||
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
|
||||
endforeach()
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
|
|
@ -92,15 +100,6 @@ elseif (APPLE)
|
|||
)
|
||||
endif()
|
||||
|
||||
target_link_directories(external_qt
|
||||
INTERFACE
|
||||
${qt_loc}/lib
|
||||
${qt_loc}/plugins
|
||||
${qt_loc}/plugins/bearer
|
||||
${qt_loc}/plugins/platforms
|
||||
${qt_loc}/plugins/imageformats
|
||||
)
|
||||
|
||||
target_link_libraries(external_qt
|
||||
INTERFACE
|
||||
${qt_libs_list}
|
||||
|
|
|
|||
7
external/zlib/CMakeLists.txt
vendored
7
external/zlib/CMakeLists.txt
vendored
|
|
@ -41,12 +41,9 @@ INTERFACE
|
|||
if (WIN32)
|
||||
target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI)
|
||||
|
||||
target_link_directories(external_zlib
|
||||
INTERFACE
|
||||
${libs_loc}/zlib/contrib/vstudio/vc14/x86/ZlibStat$<IF:$<CONFIG:Debug>,Debug,ReleaseWithoutAsm>
|
||||
)
|
||||
set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/x86/ZlibStat$<IF:$<CONFIG:Debug>,Debug,ReleaseWithoutAsm>)
|
||||
|
||||
target_link_libraries(external_zlib INTERFACE zlibstat)
|
||||
target_link_libraries(external_zlib INTERFACE ${zlib_lib_loc}/zlibstat.lib)
|
||||
else()
|
||||
target_link_libraries(external_zlib INTERFACE /usr/local/lib/libz.a)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue