diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-02-18 11:24:41 +0100 |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-02-18 11:24:41 +0100 |
| commit | f999a59afe804063cebf4dd89ef99662829bf3e4 (patch) | |
| tree | 3c344d237172310b5500568891138977b910b22c | |
| parent | 7fb2bb3e8b0dc7bc718aadc4ab9a74cb7fdb656e (diff) | |
| download | cmake-f999a59afe804063cebf4dd89ef99662829bf3e4.tar.gz | |
Ninja: don't define MSVC_IDE when using the ninja generator
Thanks to Oscar Fuentes
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index ccccbc9261..be6abb690d 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -37,7 +37,7 @@ SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") # that is automatically copied into try_compile directories # by the global generator. SET(MSVC_IDE 1) -IF(CMAKE_GENERATOR MATCHES "Makefiles") +IF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") SET(MSVC_IDE 0) IF(NOT CMAKE_VC_COMPILER_TESTS_RUN) SET(CMAKE_VC_COMPILER_TESTS 1) @@ -125,7 +125,7 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles") ENDIF(CMAKE_COMPILER_RETURN) MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3") ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) -ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") +ENDIF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) SET(CMAKE_CL_64 1) |