diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-05 11:29:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-05 11:29:20 -0500 |
| commit | 26325bab289d533df36cbac53c1e428d72e7cf85 (patch) | |
| tree | 0fd00efa5355852da55e84bfc6ab73b62a51aa02 | |
| parent | 2d7e7e8e05c6c0c31b34d44df911a1a3b636ff4a (diff) | |
update minimum required version, and make it the same for all platforms
| -rw-r--r-- | indra/CMakeLists.txt | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index dde700c932..4771923871 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -3,14 +3,8 @@ # cmake_minimum_required should appear before any # other commands to guarantee full compatibility # with the version specified - -# The "cmake -E touch" command was released with 2.4.8. -cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR) - -# This makes cmake 2.6 not complain about version 2.4 compatibility. -if (COMMAND cmake_policy) - cmake_policy(SET CMP0003 OLD) -endif (COMMAND cmake_policy) +## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly +cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING "The root project/makefile/solution name. Defaults to SecondLife.") @@ -21,13 +15,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") include(Variables) include(BuildVersion) -if (DARWIN) - # 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) set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type. One of: Debug Release RelWithDebInfo" FORCE) |