Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2015-10-25 15:17:26 +01:00
parent 8514e93ff9
commit aeb814932f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeModules/PCHSupport.cmake
View file

@ -16,9 +16,9 @@ ELSE()
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
OUTPUT_VARIABLE gcc_compiler_version) OUTPUT_VARIABLE gcc_compiler_version)
IF(gcc_compiler_version MATCHES "^4\\.1(\\.[0-9]+)?") IF(gcc_compiler_version VERSION_LESS "4.2")
SET(PCHSupport_FOUND FALSE) SET(PCHSupport_FOUND FALSE)
ELSEIF(gcc_compiler_version MATCHES "^4\\.[0-9]+(\\.[0-9]+)?") ELSE()
SET(PCHSupport_FOUND TRUE) SET(PCHSupport_FOUND TRUE)
ENDIF() ENDIF()
ELSE() ELSE()

4
code/CMakeModules/nel.cmake
View file

@ -102,10 +102,10 @@ ENDMACRO(NL_TARGET_DRIVER)
# Argument: # Argument:
### ###
MACRO(NL_DEFAULT_PROPS name label) MACRO(NL_DEFAULT_PROPS name label)
IF(HAVE_REVISION_H) IF(TARGET revision)
# explicitly say that the target depends on revision.h # explicitly say that the target depends on revision.h
ADD_DEPENDENCIES(${name} revision) ADD_DEPENDENCIES(${name} revision)
ENDIF(HAVE_REVISION_H) ENDIF()
# Note: This is just a workaround for a CMake bug generating VS10 files with a colon in the project name. # Note: This is just a workaround for a CMake bug generating VS10 files with a colon in the project name.
# CMake Bug ID: http://www.cmake.org/Bug/view.php?id=11819 # CMake Bug ID: http://www.cmake.org/Bug/view.php?id=11819