Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed MingW build's handling of debug d postfix.

  • Loading branch information...
commit 1d6ac0e101d3fcf6665e0e327e4eeb3f8680b436 1 parent 405bfae
Robert OSFIELD authored
Showing with 2 additions and 7 deletions.
  1. +2 −7 CMakeModules/OsgMacroUtils.cmake
View
9 CMakeModules/OsgMacroUtils.cmake
@@ -282,12 +282,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
ADD_LIBRARY(${TARGET_TARGETNAME} STATIC ${TARGET_SRC} ${TARGET_H})
ENDIF(DYNAMIC_OPENSCENEGRAPH)
- #not sure if needed, but for plugins only Msvc need the d suffix
- IF(NOT MSVC)
- IF(NOT UNIX)
- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
- ENDIF(NOT UNIX)
- ELSE(NOT MSVC)
+ IF(MSVC)
IF(NOT CMAKE24)
SET_OUTPUT_DIR_PROPERTY_260(${TARGET_TARGETNAME} "${OSG_PLUGINS}") # Sets the ouput to be /osgPlugin-X.X.X ; also ensures the /Debug /Release are removed
ELSE(NOT CMAKE24)
@@ -316,7 +311,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
ENDIF(OSG_MSVC_VERSIONED_DLL)
ENDIF(NOT CMAKE24)
- ENDIF(NOT MSVC)
+ ENDIF(MSVC)
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Plugins")
Please sign in to comment.
Something went wrong with that request. Please try again.