upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-17 15:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update how the icu libraries are linked.

Browse Source
This commit is contained in:
Pentarctagon 2021-05-13 19:43:06 -05:00 committed by Pentarctagon
parent 41f2263c09
commit edfa4ac345
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# set minimum version
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.7)
project(wesnoth)
@ -79,6 +79,7 @@ else()
endif()
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem)
find_package(ICU REQUIRED COMPONENTS data i18n uc)
# no, gettext executables are not required when NLS is deactivated
find_package(Gettext)

5
src/CMakeLists.txt
View File

@ -37,10 +37,9 @@ link_directories(
${LIBDBUS_LIBRARY_DIRS}
)
set(common-external-libs ${ICU_DATA_LIBRARY} ${ICU_I18N_LIBRARY} ${ICU_UC_LIBRARY})
if(WIN32)
set(common-external-libs shlwapi.lib winmm.lib)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(common-external-libs "-licudata -licui18n -licuuc")
set(common-external-libs ${common-external-libs} shlwapi.lib winmm.lib)
endif(WIN32)
set(game-external-libs