From 3e43b0f4ca58aa859de455efe9503a6f6602fe6d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 1 Nov 2010 14:21:56 -0400 Subject: On Mac, require at least CMake 2.6.4 for an important bug fix. 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". With 2.6.2, the Mac build breaks in a mysterious way. Changing this version requirement should clarify the solution. --- indra/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/CMakeLists.txt') 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) -- cgit v1.2.3