Some more cmake cleanups.
Also moved boost and openssl to using the "import targets" (ie: https://cmake.org/cmake/help/latest/module/FindBoost.html#imported-targets) which are apparently the modern way to use cmake. Many of the other libraries don't support that however, and SDL is only fully(?) supported using this as of cmake 3.19.
This commit is contained in:
Pentarctagon
Pentarctagon
parent
34a493e6df
commit
24d546df63
2 changed files with 84 additions and 55 deletions
|
|
@ -1,5 +1,5 @@
|
|||
# set minimum version
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(wesnoth)
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ else()
|
|||
set(OPENSSL_CRYPTO_LIBRARY "-framework Security")
|
||||
endif()
|
||||
|
||||
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine)
|
||||
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem)
|
||||
|
||||
# no, gettext executables are not required when NLS is deactivated
|
||||
find_package(Gettext)
|
||||
|
|
@ -95,9 +95,6 @@ if(NOT WIN32)
|
|||
# equivalent to sdl2-config --cflags --libs
|
||||
# since cmake cannot execute sdl2-config in msys2 shell
|
||||
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -I/mingw64/include/SDL2 -Dmain=SDL_main -L/mingw64/lib -lmingw32 -lSDL2main -lSDL2 -mwindows)
|
||||
|
||||
# MinGW system libraries that should be linked to wesnoth
|
||||
set(MINGW_SYSTEM_LIBS wsock32 ws2_32 shlwapi winmm)
|
||||
endif()
|
||||
|
||||
# Use the safer `mkstemp' instead of `tmpnam' on POSIX systems.
|
||||
|
|
@ -495,6 +492,7 @@ endif(ENABLE_DEBUG_WINDOW_LAYOUT)
|
|||
#
|
||||
|
||||
if(ENABLE_GAME OR ENABLE_TESTS)
|
||||
# TODO: SDL2::SDL2 etc component target available with cmake 3.19+
|
||||
find_package(SDL2 2.0.8 REQUIRED)
|
||||
find_package(SDL2_image 2.0.2 REQUIRED)
|
||||
find_package(SDL2_mixer 2.0.0 REQUIRED)
|
||||
|
|
@ -502,6 +500,7 @@ if(ENABLE_GAME OR ENABLE_TESTS)
|
|||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(CAIRO REQUIRED cairo>=1.10)
|
||||
pkg_check_modules(PANGOCAIRO REQUIRED pangocairo>=1.22.0)
|
||||
# TODO: can use find_package and Fontconfig::Fontconfig with cmake 3.14+
|
||||
pkg_check_modules(FONTCONFIG REQUIRED fontconfig>=2.4.1)
|
||||
if(NOT WIN32)
|
||||
pkg_check_modules(SYSTEMD systemd)
|
||||
|
|
@ -532,9 +531,6 @@ if(ENABLE_GAME)
|
|||
endif(ENABLE_HISTORY AND HISTORY_FOUND)
|
||||
endif(ENABLE_GAME)
|
||||
|
||||
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS filesystem)
|
||||
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS locale)
|
||||
|
||||
if(ENABLE_POT_UPDATE_TARGET)
|
||||
find_package(TranslationTools REQUIRED)
|
||||
endif(ENABLE_POT_UPDATE_TARGET)
|
||||
|
|
|
|||
|
|
@ -13,23 +13,14 @@ if(ENABLE_MYSQL)
|
|||
endif(ENABLE_MYSQL)
|
||||
|
||||
## some includes ##
|
||||
include_directories(SYSTEM ${FONTCONFIG_INCLUDE_DIRS} )
|
||||
include_directories(SYSTEM ${PANGOCAIRO_INCLUDE_DIRS} )
|
||||
include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR} )
|
||||
include_directories(SYSTEM ${LIBDBUS_INCLUDE_DIRS} )
|
||||
include_directories(SYSTEM ${VORBISFILE_INCLUDE_DIR} )
|
||||
|
||||
include_directories(SYSTEM ${SDL2_INCLUDE_DIR} )
|
||||
set(sdl-lib ${SDL2_LIBRARY})
|
||||
#optional dependencies
|
||||
if(SDL2IMAGE_INCLUDE_DIR)
|
||||
include_directories(SYSTEM ${SDL2IMAGE_INCLUDE_DIR} )
|
||||
set(sdl_image-lib ${SDL2_IMAGE_LIBRARY})
|
||||
endif()
|
||||
if(SDL2MIXER_INCLUDE_DIR)
|
||||
include_directories(SYSTEM ${SDL2MIXER_INCLUDE_DIR} )
|
||||
set(sdl_mixer-lib ${SDL2_MIXER_LIBRARY})
|
||||
endif()
|
||||
include_directories(SYSTEM ${FONTCONFIG_INCLUDE_DIRS})
|
||||
include_directories(SYSTEM ${PANGOCAIRO_INCLUDE_DIRS})
|
||||
include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR})
|
||||
include_directories(SYSTEM ${LIBDBUS_INCLUDE_DIRS})
|
||||
include_directories(SYSTEM ${VORBISFILE_INCLUDE_DIR})
|
||||
include_directories(SYSTEM ${SDL2_INCLUDE_DIR})
|
||||
include_directories(SYSTEM ${SDL2IMAGE_INCLUDE_DIR})
|
||||
include_directories(SYSTEM ${SDL2MIXER_INCLUDE_DIR})
|
||||
|
||||
if(ZLIB_INCLUDE_DIR)
|
||||
include_directories(SYSTEM ${ZLIB_INCLUDE_DIR} )
|
||||
|
|
@ -41,36 +32,22 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/ )
|
|||
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
|
||||
link_directories(
|
||||
${Boost_LIBRARY_DIRS}
|
||||
${PANGOCAIRO_LIBRARY_DIRS}
|
||||
${FONTCONFIG_LIBRARY_DIRS}
|
||||
${LIBDBUS_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
set(common-external-libs
|
||||
${Boost_IOSTREAMS_LIBRARY}
|
||||
${Boost_REGEX_LIBRARY}
|
||||
${Boost_PROGRAM_OPTIONS_LIBRARY}
|
||||
${Boost_FILESYSTEM_LIBRARY}
|
||||
${Boost_LOCALE_LIBRARY}
|
||||
)
|
||||
if(WIN32)
|
||||
set(common-external-libs ${common-external-libs} shlwapi.lib winmm.lib)
|
||||
set(common-external-libs shlwapi.lib winmm.lib)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(common-external-libs "-licudata -licui18n -licuuc")
|
||||
endif(WIN32)
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(common-external-libs ${common-external-libs} "-licudata -licui18n -licuuc")
|
||||
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
|
||||
set(game-external-libs
|
||||
${common-external-libs}
|
||||
${sdl-lib}
|
||||
${OPENSSL_CRYPTO_LIBRARY}
|
||||
${Boost_SYSTEM_LIBRARIES}
|
||||
${Boost_RANDOM_LIBRARY}
|
||||
${Boost_THREAD_LIBRARY}
|
||||
${sdl_image-lib}
|
||||
${sdl_mixer-lib}
|
||||
${SDL2_LIBRARY}
|
||||
${SDL2_IMAGE_LIBRARY}
|
||||
${SDL2_MIXER_LIBRARY}
|
||||
${PANGOCAIRO_LIBRARIES}
|
||||
${FONTCONFIG_LIBRARIES}
|
||||
${LIBDBUS_LIBRARIES}
|
||||
|
|
@ -83,10 +60,6 @@ endif(ENABLE_HISTORY AND HISTORY_FOUND)
|
|||
|
||||
set(server-external-libs
|
||||
${common-external-libs}
|
||||
${Boost_SYSTEM_LIBRARIES}
|
||||
${Boost_RANDOM_LIBRARY}
|
||||
${Boost_COROUTINE_LIBRARY}
|
||||
${OPENSSL_CRYPTO_LIBRARY}
|
||||
${MYSQL_LIBS}
|
||||
)
|
||||
|
||||
|
|
@ -99,8 +72,8 @@ if(APPLE)
|
|||
endif(APPLE)
|
||||
|
||||
if(MINGW)
|
||||
set(server-external-libs ${server-external-libs} ${MINGW_SYSTEM_LIBS})
|
||||
set(game-external-libs ${game-external-libs} ${MINGW_SYSTEM_LIBS})
|
||||
set(server-external-libs ${server-external-libs} wsock32 ws2_32 shlwapi winmm)
|
||||
set(game-external-libs ${game-external-libs} wsock32 ws2_32 shlwapi winmm)
|
||||
endif(MINGW)
|
||||
|
||||
# get source lists
|
||||
|
|
@ -202,7 +175,23 @@ if(ENABLE_GAME)
|
|||
add_executable(wesnoth wesnoth.cpp)
|
||||
endif(WIN32)
|
||||
|
||||
target_link_libraries(wesnoth wesnoth-common ${WIDGETS_LIB} wesnoth-client wesnoth-common ${game-external-libs})
|
||||
target_link_libraries(wesnoth
|
||||
wesnoth-common
|
||||
${WIDGETS_LIB}
|
||||
wesnoth-client
|
||||
wesnoth-common
|
||||
${game-external-libs}
|
||||
OpenSSL::Crypto
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
Boost::system
|
||||
Boost::thread
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
Boost::filesystem
|
||||
)
|
||||
add_dependencies(wesnoth wesnoth-revision)
|
||||
|
||||
set_target_properties(wesnoth PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnoth${BINARY_SUFFIX})
|
||||
|
|
@ -222,7 +211,24 @@ if(ENABLE_TESTS)
|
|||
target_link_options(boost_unit_tests PRIVATE /WX /WHOLEARCHIVE:wesnoth-widgets)
|
||||
endif(WIN32)
|
||||
|
||||
target_link_libraries(boost_unit_tests wesnoth-common ${WIDGETS_LIB} wesnoth-client wesnoth-common ${game-external-libs} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
|
||||
target_link_libraries(boost_unit_tests
|
||||
wesnoth-common
|
||||
${WIDGETS_LIB}
|
||||
wesnoth-client
|
||||
wesnoth-common
|
||||
${game-external-libs}
|
||||
OpenSSL::Crypto
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
Boost::system
|
||||
Boost::thread
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
Boost::filesystem
|
||||
Boost::unit_test_framework
|
||||
)
|
||||
add_dependencies(boost_unit_tests wesnoth-revision)
|
||||
|
||||
set_target_properties(boost_unit_tests PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}boost_unit_tests${BINARY_SUFFIX})
|
||||
|
|
@ -241,7 +247,20 @@ if(ENABLE_SERVER)
|
|||
target_link_libraries(wesnothd mariadbclientpp)
|
||||
endif(ENABLE_MYSQL)
|
||||
|
||||
target_link_libraries(wesnothd wesnoth-common ${server-external-libs})
|
||||
target_link_libraries(wesnothd
|
||||
wesnoth-common
|
||||
${server-external-libs}
|
||||
OpenSSL::Crypto
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
Boost::system
|
||||
Boost::thread
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
Boost::filesystem
|
||||
)
|
||||
if(WIN32)
|
||||
target_link_options(wesnothd PRIVATE /WX)
|
||||
endif(WIN32)
|
||||
|
|
@ -265,7 +284,21 @@ if(ENABLE_CAMPAIGN_SERVER)
|
|||
target_link_libraries(campaignd mariadbclientpp)
|
||||
endif(ENABLE_MYSQL)
|
||||
|
||||
target_link_libraries(campaignd wesnoth-common ${server-external-libs})
|
||||
target_link_libraries(
|
||||
campaignd
|
||||
wesnoth-common
|
||||
${server-external-libs}
|
||||
OpenSSL::Crypto
|
||||
Boost::iostreams
|
||||
Boost::program_options
|
||||
Boost::regex
|
||||
Boost::system
|
||||
Boost::thread
|
||||
Boost::random
|
||||
Boost::coroutine
|
||||
Boost::locale
|
||||
Boost::filesystem
|
||||
)
|
||||
if(WIN32)
|
||||
target_link_options(campaignd PRIVATE /WX)
|
||||
endif(WIN32)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue