CMake: make OGRE_BIN_DIRECTORY configurable

syandus · Jan 3, 2022 · f04a9e8 · f04a9e8
1 parent 52f09dc
commit f04a9e8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake
@@ -103,7 +103,7 @@ if (OGRE_INSTALL_DEPENDENCIES)
     endif()
 
     if (EXISTS ${OGRE_DEP_DIR}/bin/)
-        install(DIRECTORY ${OGRE_DEP_DIR}/bin/ DESTINATION bin)
+      install(DIRECTORY ${OGRE_DEP_DIR}/bin/ DESTINATION ${OGRE_BIN_DIRECTORY})
     endif ()
   endif ()
 

diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
@@ -97,58 +97,58 @@ function(ogre_install_target TARGETNAME SUFFIX EXPORT)
 	if(EXPORT)
 	  install(TARGETS ${TARGETNAME} EXPORT OgreTargetsRelease
 		CONFIGURATIONS Release None ""
-		BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELEASE_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELEASE_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release")
 	  install(TARGETS ${TARGETNAME} EXPORT OgreTargetsRelWithDebInfo
 		CONFIGURATIONS RelWithDebInfo
-		BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELWDBG_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELWDBG_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELWDBG_PATH}/RelWithDebInfo")
 	  install(TARGETS ${TARGETNAME} EXPORT OgreTargetsMinSizeRel
 		CONFIGURATIONS MinSizeRel
-		BUNDLE DESTINATION "bin${OGRE_MINSIZE_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_MINSIZE_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_MINSIZE_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_MINSIZE_PATH}/MinSizeRel")
 	  install(TARGETS ${TARGETNAME} EXPORT OgreTargetsDebug
 		CONFIGURATIONS Debug
-		BUNDLE DESTINATION "bin${OGRE_DEBUG_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_DEBUG_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_DEBUG_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_DEBUG_PATH}/Debug")
 	else()
 	  install(TARGETS ${TARGETNAME}
 		CONFIGURATIONS Release None ""
-		BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}" 
-		RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELEASE_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELEASE_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release")
 	  install(TARGETS ${TARGETNAME}
 		CONFIGURATIONS RelWithDebInfo
-		BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_RELWDBG_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELWDBG_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_RELWDBG_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELWDBG_PATH}/RelWithDebInfo")
 	  install(TARGETS ${TARGETNAME}
 		CONFIGURATIONS MinSizeRel
-		BUNDLE DESTINATION "bin${OGRE_MINSIZE_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_MINSIZE_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_MINSIZE_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_MINSIZE_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_MINSIZE_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_MINSIZE_PATH}/MinSizeRel")
 	  install(TARGETS ${TARGETNAME}
 		CONFIGURATIONS Debug
-		BUNDLE DESTINATION "bin${OGRE_DEBUG_PATH}"
-		RUNTIME DESTINATION "bin${OGRE_DEBUG_PATH}"
+		BUNDLE DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_DEBUG_PATH}"
+		RUNTIME DESTINATION "${OGRE_BIN_DIRECTORY}${OGRE_DEBUG_PATH}"
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}"
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}${SUFFIX}"
 		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_DEBUG_PATH}/Debug")

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -388,6 +388,7 @@ option(OGRE_PROFILING "Enable internal instrumentation." FALSE)
 set(OGRE_PROFILING_REMOTERY_PATH "" CACHE PATH "set this to Remotery/lib to use Remotery instead of the buildin profiler")
 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_BIN_DIRECTORY "bin" CACHE STRING "Install path for binaries")
 
 cmake_dependent_option(OGRE_INSTALL_VSPROPS "Install Visual Studio Property Page." FALSE "MSVC" FALSE)
 if (OGRE_INSTALL_VSPROPS)
@@ -428,6 +429,7 @@ mark_as_advanced(
   OGRE_PROFILING
   OGRE_CONFIG_STATIC_LINK_CRT
   OGRE_LIB_DIRECTORY
+  OGRE_BIN_DIRECTORY
 )
 
 ###################################################################