1
0
Fork 0

Use absolute paths instead of target_link_directories.

This commit is contained in:
John Preston 2019-11-29 13:55:33 +03:00
parent 52eaa9cd61
commit b28ca5aca2
6 changed files with 57 additions and 79 deletions

View file

@ -12,12 +12,9 @@ INTERFACE
${libs_loc}/lzma/C ${libs_loc}/lzma/C
) )
target_link_directories(external_lzma set(lzma_lib_loc ${libs_loc}/lzma/C/Util/LzmaLib/$<IF:$<CONFIG:Debug>,Debug,Release>)
INTERFACE
${libs_loc}/lzma/C/Util/LzmaLib/$<IF:$<CONFIG:Debug>,Debug,Release>
)
target_link_libraries(external_lzma target_link_libraries(external_lzma
INTERFACE INTERFACE
LzmaLib ${lzma_lib_loc}/LzmaLib.lib
) )

View file

@ -12,14 +12,11 @@ INTERFACE
${libs_loc}/breakpad/src ${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 target_link_libraries(external_breakpad
INTERFACE INTERFACE
windows/common ${breakpad_lib_loc}/windows/common.lib
windows/handler/exception_handler ${breakpad_lib_loc}/windows/handler/exception_handler.lib
windows/crash_generation/crash_generation_client ${breakpad_lib_loc}/windows/crash_generation/crash_generation_client.lib
)
target_link_directories(external_breakpad
INTERFACE
${libs_loc}/breakpad/src/out/$<IF:$<CONFIG:Debug>,Debug,Release>/obj/client
) )

View file

@ -13,26 +13,17 @@ INTERFACE
) )
if (WIN32) if (WIN32)
target_link_directories(external_openssl set(openssl_lib_ext lib)
INTERFACE set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out32$<$<CONFIG:Debug>:.dbg>)
${libs_loc}/openssl_1_1_1/out32$<$<CONFIG:Debug>:.dbg>
)
target_link_libraries(external_openssl
INTERFACE
libcrypto
libssl
)
else() else()
set(openssl_lib_ext a)
if (APPLE) if (APPLE)
target_link_directories(external_openssl set(openssl_lib_loc ${libs_loc}/openssl_1_1_1)
INTERFACE
${libs_loc}/openssl_1_1_1
)
endif() endif()
target_link_libraries(external_openssl
INTERFACE
crypto
ssl
)
endif() endif()
target_link_libraries(external_openssl
INTERFACE
${openssl_lib_loc}/libcrypto.${openssl_lib_ext}
${openssl_lib_loc}/libssl.${openssl_lib_ext}
)

View file

@ -13,14 +13,11 @@ INTERFACE
) )
if (WIN32) if (WIN32)
target_link_directories(external_opus set(opus_lib_loc ${libs_loc}/opus/win32/VS2015/Win32/$<IF:$<CONFIG:Debug>,Debug,Release>)
INTERFACE
${libs_loc}/opus/win32/VS2015/Win32/$<IF:$<CONFIG:Debug>,Debug,Release>
)
target_link_libraries(external_opus target_link_libraries(external_opus
INTERFACE INTERFACE
opus ${opus_lib_loc}/opus.lib
) )
elseif (APPLE AND NOT build_osx) elseif (APPLE AND NOT build_osx)
target_link_libraries(external_opus target_link_libraries(external_opus

View file

@ -38,52 +38,60 @@ INTERFACE
QT_CORE_LIB 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 set(common_qt_libs
qwebp plugins/imageformats/${qt_lib_prefix}qwebp
qgif plugins/imageformats/${qt_lib_prefix}qgif
qjpeg plugins/imageformats/${qt_lib_prefix}qjpeg
Qt5PrintSupport lib/${qt_lib_prefix}Qt5PrintSupport
Qt5AccessibilitySupport lib/${qt_lib_prefix}Qt5AccessibilitySupport
Qt5FontDatabaseSupport lib/${qt_lib_prefix}Qt5FontDatabaseSupport
Qt5EventDispatcherSupport lib/${qt_lib_prefix}Qt5EventDispatcherSupport
Qt5ThemeSupport lib/${qt_lib_prefix}Qt5ThemeSupport
Qt5Network lib/${qt_lib_prefix}Qt5Network
Qt5Widgets lib/${qt_lib_prefix}Qt5Widgets
Qt5Gui lib/${qt_lib_prefix}Qt5Gui
qtharfbuzz lib/${qt_lib_prefix}qtharfbuzz
qtlibpng lib/${qt_lib_prefix}qtlibpng
) )
set(qt_libs_list "") set(qt_libs_list "")
if (WIN32) if (WIN32)
set(qt_libs set(qt_libs
${common_qt_libs} ${common_qt_libs}
Qt5Core lib/${qt_lib_prefix}Qt5Core
Qt5WindowsUIAutomationSupport lib/${qt_lib_prefix}Qt5WindowsUIAutomationSupport
qtmain lib/${qt_lib_prefix}qtmain
qwindows lib/${qt_lib_prefix}qtfreetype
qtfreetype lib/${qt_lib_prefix}qtpcre2
qtpcre2 plugins/platforms/${qt_lib_prefix}qwindows
) )
foreach (lib ${qt_libs}) 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() endforeach()
elseif (APPLE) elseif (APPLE)
if (NOT build_osx) if (NOT build_osx)
set(qt_libs set(qt_libs
${common_qt_libs} ${common_qt_libs}
Qt5Core lib/${qt_lib_prefix}Qt5Core
Qt5GraphicsSupport lib/${qt_lib_prefix}Qt5GraphicsSupport
Qt5ClipboardSupport lib/${qt_lib_prefix}Qt5ClipboardSupport
qgenericbearer lib/${qt_lib_prefix}qtfreetype
qtfreetype lib/${qt_lib_prefix}qtpcre2
qtpcre2 plugins/platforms/${qt_lib_prefix}qcocoa
qcocoa plugins/bearer/${qt_lib_prefix}qgenericbearer
) )
else() else()
endif() endif()
foreach (lib ${qt_libs}) 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() endforeach()
target_link_libraries(external_qt target_link_libraries(external_qt
INTERFACE INTERFACE
@ -92,15 +100,6 @@ elseif (APPLE)
) )
endif() 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 target_link_libraries(external_qt
INTERFACE INTERFACE
${qt_libs_list} ${qt_libs_list}

View file

@ -41,12 +41,9 @@ INTERFACE
if (WIN32) if (WIN32)
target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI) target_compile_definitions(external_zlib INTERFACE ZLIB_WINAPI)
target_link_directories(external_zlib set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/x86/ZlibStat$<IF:$<CONFIG:Debug>,Debug,ReleaseWithoutAsm>)
INTERFACE
${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() else()
target_link_libraries(external_zlib INTERFACE /usr/local/lib/libz.a) target_link_libraries(external_zlib INTERFACE /usr/local/lib/libz.a)
endif() endif()