upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-29 10:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't require SDL2 or OGL for building the servers.

Browse Source 
Requiring SDL2 was masking needing to add -lpthread explicitly.

(cherry-picked from commit fd34fe849770de379096ac1ffe612fb22473a846)
This commit is contained in:
Pentarctagon 2018-05-15 16:16:09 -05:00
parent 86f6debd57
commit 461ce4975d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -76,9 +76,11 @@ else()
message(WARNING "You are cross-compiling. Skipping IEEE 754 test.") message(WARNING "You are cross-compiling. Skipping IEEE 754 test.")
endif() endif()
find_package(OpenGL REQUIRED) if(ENABLE_GAME OR ENABLE_TESTS)
find_package(GLEW REQUIRED) find_package(OpenGL REQUIRED)
find_package(SDL2 2.0.4 REQUIRED) find_package(GLEW REQUIRED)
find_package(SDL2 2.0.4 REQUIRED)
endif(ENABLE_GAME OR ENABLE_TESTS)
find_package(Crypto 1.0 REQUIRED) find_package(Crypto 1.0 REQUIRED)
find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system random) find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system random)

1
src/CMakeLists.txt
View File

@ -101,6 +101,7 @@ set(server-external-libs
${Boost_RANDOM_LIBRARY} ${Boost_RANDOM_LIBRARY}
${CRYPTO_LIBRARY} ${CRYPTO_LIBRARY}
${MYSQL_LIBS} ${MYSQL_LIBS}
-lpthread
) )
if(ENABLE_FRIBIDI AND FRIBIDI_FOUND) if(ENABLE_FRIBIDI AND FRIBIDI_FOUND)