CMake: fix exported OGRE_PLUGIN_DIR

OGRECave · Mar 26, 2022 · 4040a79 · 4040a79
1 parent f154a54
commit 4040a79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
@@ -238,17 +238,9 @@ if (NOT OGRE_CMAKE_DIR)
   endif()
 endif()
 
-if (NOT OGRE_PLUGIN_DIR_CMAKE)
-  if(WIN32)
-    set(OGRE_PLUGIN_DIR_CMAKE "bin")
-  else()
-    set(OGRE_PLUGIN_DIR_CMAKE "${OGRE_LIB_DIRECTORY}/OGRE")
-  endif()
-endif()
-
 configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
     INSTALL_DESTINATION ${OGRE_CMAKE_DIR}
-    PATH_VARS OGRE_MEDIA_PATH OGRE_PLUGIN_DIR_CMAKE OGRE_CFG_INSTALL_PATH CMAKE_INSTALL_PREFIX)
+    PATH_VARS OGRE_MEDIA_PATH OGRE_PLUGINS_PATH OGRE_CFG_INSTALL_PATH CMAKE_INSTALL_PREFIX)
 write_basic_package_version_file(
     ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake 
     VERSION ${OGRE_VERSION} 

diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in
@@ -24,7 +24,7 @@
 
 set(OGRE_STATIC @OGRE_STATIC@)
 set_and_check(OGRE_MEDIA_DIR "@PACKAGE_OGRE_MEDIA_PATH@")
-set_and_check(OGRE_PLUGIN_DIR "@PACKAGE_OGRE_PLUGIN_DIR_CMAKE@")
+set_and_check(OGRE_PLUGIN_DIR "@PACKAGE_OGRE_PLUGINS_PATH@")
 set_and_check(OGRE_CONFIG_DIR "@PACKAGE_OGRE_CFG_INSTALL_PATH@")
 
 set(OGRE_PREFIX_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@")