diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2019-04-26 23:39:31 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2019-04-26 23:39:31 +0000 |
| commit | f6c4ac8eb8488a8a4711e92c8d4e9d08c549e1b2 (patch) | |
| tree | f319456eacfc5353325a84f7c4f76a2c5673be66 /graphics/ogre3d19/files/patch-CMakeLists.txt | |
| parent | Update to version 1.5.9 (diff) | |
- Copy graphics/ogre3d to graphics/ogre3d19 and add mutual conflicts
- Switch all ogre3d consumers to ogre3d19
This allows to update ogre3d to the latest version without breaking
existing ports. The plans are also to make it possible for both ogre3d
versions to coexist.
Approved by: oliver (discussed via private email)
Notes
Notes:
svn path=/head/; revision=500178
Diffstat (limited to 'graphics/ogre3d19/files/patch-CMakeLists.txt')
| -rw-r--r-- | graphics/ogre3d19/files/patch-CMakeLists.txt | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/graphics/ogre3d19/files/patch-CMakeLists.txt b/graphics/ogre3d19/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e3f58a8239db --- /dev/null +++ b/graphics/ogre3d19/files/patch-CMakeLists.txt @@ -0,0 +1,30 @@ +--- CMakeLists.txt.orig 2013-12-01 18:28:12.000000000 +0100 ++++ CMakeLists.txt 2014-03-11 21:56:26.000000000 +0100 +@@ -102,9 +102,9 @@ + 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 () +@@ -435,6 +435,7 @@ + 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) +@@ -477,6 +478,7 @@ + OGRE_PROFILING + OGRE_CONFIG_STATIC_LINK_CRT + OGRE_LIB_DIRECTORY ++ OGRE_LIBDATA_DIRECTORY + ) + + ################################################################### |