mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
0214713fbc
* [ogre] update to latest version (v13.6.2) * update version * revert patch formating * update version
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
|
|
index 09789ce..3d918e4 100644
|
|
--- a/CMake/InstallResources.cmake
|
|
+++ b/CMake/InstallResources.cmake
|
|
@@ -61,7 +61,6 @@ elseif (APPLE)
|
|
endif()
|
|
# these are resolved relative to the app bundle
|
|
set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/")
|
|
- set(OGRE_CFG_INSTALL_PATH "bin")
|
|
elseif (UNIX)
|
|
set(OGRE_TEST_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/Tests/Media")
|
|
set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples")
|
|
@@ -155,6 +154,10 @@ endif()
|
|
|
|
set(OGRE_SAMPLE_RESOURCES "")
|
|
|
|
+set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_PLUGINS_PATH}")
|
|
+cmake_path(RELATIVE_PATH OGRE_PLUGIN_DIR_REL BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${OGRE_CFG_INSTALL_PATH}")
|
|
+set(OGRE_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_MEDIA_PATH}")
|
|
+cmake_path(RELATIVE_PATH OGRE_MEDIA_DIR_REL BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${OGRE_CFG_INSTALL_PATH}")
|
|
set(OGRE_CORE_MEDIA_DIR "${OGRE_MEDIA_DIR_REL}")
|
|
|
|
# CREATE CONFIG FILES - INSTALL VERSIONS
|
|
diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt
|
|
index 427c581..fc690eb 100644
|
|
--- a/Components/Bites/CMakeLists.txt
|
|
+++ b/Components/Bites/CMakeLists.txt
|
|
@@ -138,7 +138,7 @@ elseif(UNIX)
|
|
set_source_files_properties(src/OgreBitesConfigDialog.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_XAW)
|
|
list(APPEND SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGLXConfigDialog.cpp")
|
|
list(APPEND DEPENDENCIES ${X11_Xt_LIB} ${XAW_LIBRARY})
|
|
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/GLX_backdrop.png" DESTINATION "share/OGRE/")
|
|
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/GLX_backdrop.png" DESTINATION "${OGRE_MEDIA_PATH}/..")
|
|
endif()
|
|
endif()
|
|
|