mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Remove obsolete link libraries
None of them are actually linked any more - most were due to using libgit2 for masterlist updates. Also refactor the CMakeLists.txt as the libraries are target-dependent, not compiler-dependent.
This commit is contained in:
@@ -99,12 +99,7 @@ jobs:
|
||||
doxygen \
|
||||
language-pack-el \
|
||||
language-pack-tr \
|
||||
libbz2-dev \
|
||||
libcurl4-gnutls-dev \
|
||||
libhttp-parser-dev \
|
||||
libicu-dev \
|
||||
libssh2-1-dev \
|
||||
libssl-dev \
|
||||
g++-8
|
||||
|
||||
- name: Run CMake
|
||||
|
||||
@@ -71,16 +71,11 @@ jobs:
|
||||
- name: Install APT package dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
sudo apt-get install -y --no-upgrade \
|
||||
doxygen \
|
||||
language-pack-el \
|
||||
language-pack-tr \
|
||||
libbz2-dev \
|
||||
libcurl4-gnutls-dev \
|
||||
libhttp-parser-dev \
|
||||
libicu-dev \
|
||||
libssh2-1-dev \
|
||||
libssl-dev \
|
||||
g++-8
|
||||
|
||||
- name: Run CMake
|
||||
|
||||
+10
-34
@@ -409,9 +409,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
UNICODE _UNICODE LOOT_STATIC)
|
||||
target_compile_definitions(loot PRIVATE UNICODE _UNICODE LOOT_EXPORT)
|
||||
target_compile_definitions(libloot_tests PRIVATE UNICODE _UNICODE)
|
||||
|
||||
set(LOOT_LIBS ws2_32 bcrypt)
|
||||
|
||||
target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
|
||||
target_link_libraries(loot PRIVATE ${LOOT_LIBS})
|
||||
else()
|
||||
target_link_libraries(libloot_internals_tests PRIVATE ICU::uc)
|
||||
target_link_libraries(loot PRIVATE ICU::uc)
|
||||
set(LOOT_LIBS ICU::uc pthread stdc++fs)
|
||||
|
||||
target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
|
||||
target_link_libraries(loot PRIVATE ${LOOT_LIBS})
|
||||
target_link_libraries(libloot_tests PRIVATE pthread)
|
||||
endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
@@ -423,26 +431,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
target_compile_options(libloot_internals_tests PRIVATE "-Wall" "-Wextra")
|
||||
target_compile_options(loot PRIVATE "-Wall" "-Wextra")
|
||||
target_compile_options(libloot_tests PRIVATE "-Wall" "-Wextra")
|
||||
|
||||
set(LOOT_LIBS ssl
|
||||
curl
|
||||
z
|
||||
crypto
|
||||
rt
|
||||
pthread
|
||||
icuuc
|
||||
icui18n
|
||||
ssh2
|
||||
http_parser
|
||||
stdc++fs)
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
list(APPEND LOOT_LIBS supc++)
|
||||
endif()
|
||||
|
||||
target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
|
||||
target_link_libraries(loot PRIVATE ${LOOT_LIBS})
|
||||
target_link_libraries(libloot_tests PRIVATE pthread)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
@@ -455,18 +443,6 @@ if(MSVC)
|
||||
"/permissive-"
|
||||
"/W4"
|
||||
"$<$<OR:$<CONFIG:DEBUG>,$<CONFIG:RelWithDebInfo>>:/bigobj>")
|
||||
|
||||
set(LOOT_LIBS
|
||||
version
|
||||
ws2_32
|
||||
shlwapi
|
||||
winhttp
|
||||
crypt32
|
||||
Rpcrt4
|
||||
bcrypt)
|
||||
|
||||
target_link_libraries(libloot_internals_tests PRIVATE ${LOOT_LIBS})
|
||||
target_link_libraries(loot PRIVATE ${LOOT_LIBS})
|
||||
endif()
|
||||
|
||||
##############################
|
||||
|
||||
Reference in New Issue
Block a user