--- CMakeLists.txt.orig 2016-02-09 19:18:58 UTC +++ CMakeLists.txt @@ -14,7 +14,7 @@ # and provide build configuration options. ###################################################################### -cmake_minimum_required(VERSION 2.6.2) +cmake_minimum_required(VERSION 3.5) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) cmake_policy(SET CMP0003 NEW) @@ -100,9 +100,9 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLAN set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") endif () # This is a set of sensible warnings that provide meaningful output - set(OGRE_WARNING_FLAGS "-Wall -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wshadow -Wno-missing-field-initializers -Wno-long-long") + set(OGRE_WARNING_FLAGS "-Wall -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wno-unused-parameter -Wshadow -Wno-missing-field-initializers -Wno-long-long") if (NOT APPLE) - set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter") + set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS}") endif () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}") endif () @@ -427,6 +427,7 @@ set(OGRE_LIB_DIRECTORY "lib${LIB_SUFFIX}" CACHE STRING option(OGRE_PROFILING "Enable internal profiling support." FALSE) cmake_dependent_option(OGRE_CONFIG_STATIC_LINK_CRT "Statically link the MS CRT dlls (msvcrt)" FALSE "MSVC" FALSE) set(OGRE_LIB_DIRECTORY "lib${LIB_SUFFIX}" CACHE STRING "Install path for libraries, e.g. 'lib64' on some 64-bit Linux distros.") +set(OGRE_LIBDATA_DIRECTORY "libdata" CACHE STRING "Install path for data files.") if (WIN32) option(OGRE_INSTALL_VSPROPS "Install Visual Studio Property Page." FALSE) if (OGRE_INSTALL_VSPROPS) @@ -468,6 +469,7 @@ mark_as_advanced( OGRE_PROFILING OGRE_CONFIG_STATIC_LINK_CRT OGRE_LIB_DIRECTORY + OGRE_LIBDATA_DIRECTORY ) ###################################################################