Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-18 21:13:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Fix issues with newer cmake versions (brought to you by Amine)
- Add support for ninja to configure script

svn path=/trunk/; revision=56788
This commit is contained in:
Timo Kreuzer 2012-06-23 16:09:11 +00:00
parent 2874d1c817
commit f6b6eea643
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/CMakeLists.txt
View file

@ -14,6 +14,9 @@ include(include/reactos/version.cmake)
# Don't escape preprocessor definition values added via add_definitions
cmake_policy(SET CMP0005 OLD)
cmake_policy(SET CMP0002 NEW)
if(POLICY CMP0018)
cmake_policy(SET CMP0018 OLD)
endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
@ -48,7 +51,7 @@ if(NOT CMAKE_CROSSCOMPILING)
if(MSVC)
if(ARCH MATCHES i386)
add_definitions(/DWIN32 /D_WINDOWS)
add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
endif()
add_definitions(/Dinline=__inline)
else()

4
reactos/configure.cmd
View file

@ -16,6 +16,8 @@ if defined ROS_ARCH (
set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles"
) else if /I "%1" == "Eclipse" (
set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"
) else if /I "%1" == "Ninja" (
set CMAKE_GENERATOR="Ninja"
) else (
set CMAKE_GENERATOR="MinGW Makefiles"
)
@ -106,6 +108,8 @@ if %USE_NMAKE% == 1 (
set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles"
) else if /I "%1" == "JOM" (
set CMAKE_GENERATOR="NMake Makefiles JOM"
) else if /I "%1" == "Ninja" (
set CMAKE_GENERATOR="Ninja"
) else (
set CMAKE_GENERATOR="NMake Makefiles"
)