mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-23 15:46:18 +00:00
Merge with develop
This commit is contained in:
parent
8514e93ff9
commit
aeb814932f
2 changed files with 4 additions and 4 deletions
|
@ -16,9 +16,9 @@ ELSE()
|
|||
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
|
||||
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)
|
||||
ELSEIF(gcc_compiler_version MATCHES "^4\\.[0-9]+(\\.[0-9]+)?")
|
||||
ELSE()
|
||||
SET(PCHSupport_FOUND TRUE)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
|
|
|
@ -102,10 +102,10 @@ ENDMACRO(NL_TARGET_DRIVER)
|
|||
# Argument:
|
||||
###
|
||||
MACRO(NL_DEFAULT_PROPS name label)
|
||||
IF(HAVE_REVISION_H)
|
||||
IF(TARGET revision)
|
||||
# explicitly say that the target depends on revision.h
|
||||
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.
|
||||
# CMake Bug ID: http://www.cmake.org/Bug/view.php?id=11819
|
||||
|
|
Loading…
Reference in a new issue