diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
| commit | 7a74f64d5eda050da0d966b0fa3e76b4b54888fa (patch) | |
| tree | b3cee2fdcf01e11cf13dca58f56c3b1d0e804739 /indra/CMakeLists.txt | |
| parent | b48dad17260a7f5fbfc4d0548b4386d62efc2e5e (diff) | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (diff) | |
Merge
Diffstat (limited to 'indra/CMakeLists.txt')
| -rw-r--r-- | indra/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 8d4969a49e..d01e1869b6 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -22,7 +22,10 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") include(Variables) if (DARWIN) - cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR) + # 2.6.4 fixes a Mac bug in get_target_property(... "SLPlugin" LOCATION): + # before that version it returns "pathname/SLPlugin", whereas the correct + # answer is "pathname/SLPlugin.app/Contents/MacOS/SLPlugin". + cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) endif (DARWIN) if (NOT CMAKE_BUILD_TYPE) |