CMake: treat minsizerel as release

bansomin · Jan 7, 2022 · c32329b · c32329b
1 parent 4ee0391
commit c32329b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
@@ -268,7 +268,6 @@ install(FILES
    ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake
    DESTINATION ${OGRE_CMAKE_DIR}
 )
-install(EXPORT OgreTargetsRelease CONFIGURATIONS Release None "" DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
+install(EXPORT OgreTargetsRelease CONFIGURATIONS Release MinSizeRel None "" DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
 install(EXPORT OgreTargetsRelWithDebInfo CONFIGURATIONS RelWithDebInfo DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
-install(EXPORT OgreTargetsMinSizeRel CONFIGURATIONS MinSizeRel DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
 install(EXPORT OgreTargetsDebug CONFIGURATIONS Debug DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
@@ -42,39 +42,35 @@ endif ()
 if (WIN32)
   set(OGRE_RELEASE_PATH "")
   set(OGRE_RELWDBG_PATH "")
-  set(OGRE_MINSIZE_PATH "")
   set(OGRE_DEBUG_PATH "")
   set(OGRE_LIB_RELEASE_PATH "")
   set(OGRE_LIB_RELWDBG_PATH "")
-  set(OGRE_LIB_MINSIZE_PATH "")
   set(OGRE_LIB_DEBUG_PATH "")
-  set(OGRE_SAMPLE_PATH "/OGRE/Samples")
 elseif (UNIX)
   set(OGRE_RELEASE_PATH "")
   set(OGRE_RELWDBG_PATH "")
-  set(OGRE_MINSIZE_PATH "")
   set(OGRE_DEBUG_PATH "/debug")
   if (NOT APPLE)
 	set(OGRE_DEBUG_PATH "")
   endif ()
   set(OGRE_LIB_RELEASE_PATH "")
   set(OGRE_LIB_RELWDBG_PATH "")
-  set(OGRE_LIB_MINSIZE_PATH "")
   set(OGRE_LIB_DEBUG_PATH "")
   if(APPLE AND NOT APPLE_IOS)
     set(OGRE_RELEASE_PATH "/${PLATFORM_NAME}")
   endif()
   if(APPLE AND APPLE_IOS)
     set(OGRE_LIB_RELEASE_PATH "/Release")
   endif(APPLE AND APPLE_IOS)
-  set(OGRE_SAMPLE_PATH "/OGRE/Samples")
 endif ()
 
+set(OGRE_SAMPLE_PATH "/OGRE/Samples")
+
 # install targets according to current build type
 function(ogre_install_target TARGETNAME SUFFIX EXPORT)
 	if(EXPORT)
 	  install(TARGETS ${TARGETNAME} EXPORT OgreTargetsRelease
-		CONFIGURATIONS Release None ""
+		CONFIGURATIONS Release MinSizeRel None ""
 		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}"
@@ -87,13 +83,6 @@ function(ogre_install_target TARGETNAME SUFFIX EXPORT)
 		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 "${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 "${OGRE_BIN_DIRECTORY}${OGRE_DEBUG_PATH}"
@@ -116,13 +105,6 @@ function(ogre_install_target TARGETNAME SUFFIX EXPORT)
 		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 "${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 "${OGRE_BIN_DIRECTORY}${OGRE_DEBUG_PATH}"
@@ -137,9 +119,8 @@ function(ogre_install_plugin TARGETNAME)
     if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
         ogre_install_target(${TARGETNAME} "" TRUE)
     else()
-        install(TARGETS ${TARGETNAME} EXPORT OgreTargetsRelease CONFIGURATIONS Release None "" DESTINATION ${OGRE_PLUGINS_PATH})
+        install(TARGETS ${TARGETNAME} EXPORT OgreTargetsRelease CONFIGURATIONS MinSizeRel Release None "" DESTINATION ${OGRE_PLUGINS_PATH})
         install(TARGETS ${TARGETNAME} EXPORT OgreTargetsRelWithDebInfo CONFIGURATIONS RelWithDebInfo DESTINATION ${OGRE_PLUGINS_PATH})
-        install(TARGETS ${TARGETNAME} EXPORT OgreTargetsMinSizeRel CONFIGURATIONS MinSizeRel DESTINATION ${OGRE_PLUGINS_PATH})
         install(TARGETS ${TARGETNAME} EXPORT OgreTargetsDebug CONFIGURATIONS Debug DESTINATION ${OGRE_PLUGINS_PATH})
     endif()
 endfunction(ogre_install_plugin)