Put these checks in the same place.
This commit is contained in:
parent
e9252bd9f2
commit
ba89526cec
1 changed files with 11 additions and 17 deletions
|
@ -74,12 +74,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|||
# forbid defaulting to gnu++NN instead of c++NN
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
if(ENABLE_GAME OR ENABLE_TESTS)
|
||||
# find_package(OpenGL REQUIRED)
|
||||
# find_package(GLEW REQUIRED)
|
||||
find_package(SDL2 2.0.4 REQUIRED)
|
||||
endif(ENABLE_GAME OR ENABLE_TESTS)
|
||||
|
||||
if(NOT APPLE)
|
||||
find_package(Crypto 1.0 REQUIRED)
|
||||
else()
|
||||
|
@ -520,18 +514,18 @@ endif(ENABLE_DEBUG_WINDOW_LAYOUT)
|
|||
#
|
||||
|
||||
if(ENABLE_GAME OR ENABLE_TESTS)
|
||||
find_package( SDL2_image 2.0.2 REQUIRED )
|
||||
endif(ENABLE_GAME OR ENABLE_TESTS)
|
||||
|
||||
if(ENABLE_GAME OR ENABLE_TESTS)
|
||||
find_package( SDL2_mixer 2.0.0 REQUIRED )
|
||||
find_package( SDL2_ttf 2.0.12 REQUIRED )
|
||||
# find_package(OpenGL REQUIRED)
|
||||
# find_package(GLEW REQUIRED)
|
||||
find_package(SDL2 2.0.4 REQUIRED)
|
||||
find_package(SDL2_image 2.0.2 REQUIRED)
|
||||
find_package(SDL2_mixer 2.0.0 REQUIRED)
|
||||
find_package(SDL2_ttf 2.0.12 REQUIRED)
|
||||
find_package(VorbisFile REQUIRED)
|
||||
find_package( PkgConfig REQUIRED )
|
||||
pkg_check_modules( CAIRO REQUIRED cairo>=1.10 )
|
||||
pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.22.0 )
|
||||
pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 )
|
||||
pkg_check_modules( SYSTEMD systemd )
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(CAIRO REQUIRED cairo>=1.10)
|
||||
pkg_check_modules(PANGOCAIRO REQUIRED pangocairo>=1.22.0)
|
||||
pkg_check_modules(FONTCONFIG REQUIRED fontconfig>=2.4.1)
|
||||
pkg_check_modules(SYSTEMD systemd)
|
||||
endif(ENABLE_GAME OR ENABLE_TESTS)
|
||||
|
||||
if(ENABLE_TESTS)
|
||||
|
|
Loading…
Add table
Reference in a new issue