mirror of https://github.com/ZDoom/qzdoom.git
- Simplify expressions inside some else/endif.
We aren't bound to old cmake anymore.
This commit is contained in:
parent
3dcc6d0330
commit
d1502b1086
|
@ -2,7 +2,7 @@ cmake_minimum_required( VERSION 2.8.7 )
|
||||||
|
|
||||||
if( COMMAND cmake_policy )
|
if( COMMAND cmake_policy )
|
||||||
cmake_policy( SET CMP0003 NEW )
|
cmake_policy( SET CMP0003 NEW )
|
||||||
endif( COMMAND cmake_policy )
|
endif()
|
||||||
|
|
||||||
include( CheckCXXSourceCompiles )
|
include( CheckCXXSourceCompiles )
|
||||||
include( CheckFunctionExists )
|
include( CheckFunctionExists )
|
||||||
|
@ -347,7 +347,7 @@ if( NOT NO_ASM )
|
||||||
# string( REGEX REPLACE ".*version ([0-9]+[.][0-9]+).*" "\\1" NASM_VER "${NASM_VER_STRING}" )
|
# string( REGEX REPLACE ".*version ([0-9]+[.][0-9]+).*" "\\1" NASM_VER "${NASM_VER_STRING}" )
|
||||||
# if( NOT NASM_VER LESS 2 )
|
# if( NOT NASM_VER LESS 2 )
|
||||||
# message( SEND_ERROR "NASM version should be 2 or later. (Installed version is ${NASM_VER}.)" )
|
# message( SEND_ERROR "NASM version should be 2 or later. (Installed version is ${NASM_VER}.)" )
|
||||||
# endif( NOT NASM_VER LESS 2 )
|
# endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( NOT NO_ASM )
|
if( NOT NO_ASM )
|
||||||
|
@ -422,7 +422,7 @@ if (NOT ZDOOM_USE_SSE2)
|
||||||
set( SSE1_ENABLE -arch:SSE )
|
set( SSE1_ENABLE -arch:SSE )
|
||||||
set( SSE2_ENABLE -arch:SSE2 )
|
set( SSE2_ENABLE -arch:SSE2 )
|
||||||
set( SSE_MATTERS YES )
|
set( SSE_MATTERS YES )
|
||||||
endif( )
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -520,7 +520,7 @@ if( UNIX )
|
||||||
message( STATUS "Could not find clock_gettime. Timing statistics will not be available." )
|
message( STATUS "Could not find clock_gettime. Timing statistics will not be available." )
|
||||||
add_definitions( -DNO_CLOCK_GETTIME )
|
add_definitions( -DNO_CLOCK_GETTIME )
|
||||||
endif()
|
endif()
|
||||||
else( NOT CLOCK_GETTIME_IN_RT )
|
else()
|
||||||
set( ZDOOM_LIBS ${ZDOOM_LIBS} rt )
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} rt )
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@ -568,12 +568,12 @@ if( MPG123_FOUND )
|
||||||
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${MPG123_LIBRARIES}" )
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${MPG123_LIBRARIES}" )
|
||||||
include_directories( "${MPG123_INCLUDE_DIR}" )
|
include_directories( "${MPG123_INCLUDE_DIR}" )
|
||||||
endif()
|
endif()
|
||||||
if( NOT DYN_FLUIDSYNTH)
|
if( NOT DYN_FLUIDSYNTH )
|
||||||
if( FLUIDSYNTH_FOUND )
|
if( FLUIDSYNTH_FOUND )
|
||||||
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FLUIDSYNTH_LIBRARIES}" )
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} "${FLUIDSYNTH_LIBRARIES}" )
|
||||||
include_directories( "${FLUIDSYNTH_INCLUDE_DIR}" )
|
include_directories( "${FLUIDSYNTH_INCLUDE_DIR}" )
|
||||||
endif()
|
endif()
|
||||||
else( NOT DYN_FLUIDSYNTH )
|
else()
|
||||||
set( ZDOOM_LIBS ${ZDOOM_LIBS} ${CMAKE_DL_LIBS} )
|
set( ZDOOM_LIBS ${ZDOOM_LIBS} ${CMAKE_DL_LIBS} )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue