Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
fbfddc70
Commit
fbfddc70
authored
Jun 19, 2012
by
David Cole
Committed by
Kitware Robot
Jun 19, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge topic 'ninja-enable-on-windows'
2077e987
Ninja: Enable the ninja generator by default on Windows.
parents
aa2c6d04
2077e987
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
Source/CMakeLists.txt
Source/CMakeLists.txt
+3
-3
No files found.
Source/CMakeLists.txt
View file @
fbfddc70
...
...
@@ -361,11 +361,11 @@ ENDIF (WIN32)
# on platforms where it does not pass all tests.
# Enforce Ninja support by setting CMAKE_USE_NINJA
set
(
_CMAKE_DEFAULT_NINJA_VALUE TRUE
)
if
(
WIN32 OR
APPLE
)
if
(
APPLE
)
SET
(
_CMAKE_DEFAULT_NINJA_VALUE FALSE
)
endif
()
SET
(
CMAKE_ENABLE_NINJA
${
_CMAKE_DEFAULT_NINJA_VALUE
}
CACHE BOOL
"Enable the ninja generator for CMake.
On Windows and OSX broken
"
)
"Enable the ninja generator for CMake.
When enabled, some CMake tests still fail on OSX
"
)
MARK_AS_ADVANCED
(
CMAKE_ENABLE_NINJA
)
IF
(
CMAKE_ENABLE_NINJA
)
MESSAGE
(
STATUS
"Ninja generator enabled."
)
...
...
@@ -384,7 +384,7 @@ IF(CMAKE_ENABLE_NINJA)
)
ADD_DEFINITIONS
(
-DCMAKE_USE_NINJA
)
ELSE
()
MESSAGE
(
STATUS
"Ninja generator disabled, en
force
with -DCMAKE_ENABLE_NINJA=ON"
)
MESSAGE
(
STATUS
"Ninja generator disabled, en
able it
with -DCMAKE_ENABLE_NINJA=ON"
)
ENDIF
()
# create a library used by the command line and the GUI
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment