diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-02 17:25:34 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-02 17:25:34 +0900 |
| commit | f78d2fad31a2e524da6d9975872240c695f7c124 (patch) | |
| tree | 1d67b97cfcedeba4dfc3941701d49c3fc6d38d24 /CMakeLists.txt | |
| parent | e65d4938f373132f2ab5c75533e0bd18e188f9bc (diff) | |
| parent | 7752d2ab43088aeb5e43d1dab764cba7428cd40c (diff) | |
| download | mruby-f78d2fad31a2e524da6d9975872240c695f7c124.tar.gz mruby-f78d2fad31a2e524da6d9975872240c695f7c124.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ee97ad8b4..c8b252d2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,13 @@ project(mruby C) # TODO stop polluting source tree with CMakeFiles/ and CMakeCache.txt # on build location check failure # Make sure we are not trying to generate in in-tree build unless building -# with a MSVC IDE where it's OK. -if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE) +# with an MSVC or Xcode IDE where it's OK. +if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT (MSVC_IDE OR XCODE)) message(FATAL_ERROR "\nIn-source builds are not allowed as CMake would overwrite the " - "Makefiles distributed with mruby. Please change to the 'build' " - "subdirectory and run CMake from there.") + "Makefiles distributed with mruby. Delete any created 'CMakeFiles' " + "subdirectory and 'CMakeCache.txt' file from the current directory, " + "change to the 'build' subdirectory, and re-run CMake from there.") endif() if(COMMAND cmake_policy) |