diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-11-01 15:19:07 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-11-01 15:19:07 -0400 |
| commit | 3bf2b7b41e4bd489b2dff9555b6553844b6df532 (patch) | |
| tree | a5a0b9c0e3aef1f1fcc540156edfa9a290f72ff6 /indra | |
| parent | 6c31be17486d345b816cc39af7dee3c48dd5bde4 (diff) | |
| parent | 3e43b0f4ca58aa859de455efe9503a6f6602fe6d (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development
Diffstat (limited to 'indra')
| -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) |