From 9a2bc98d3a5dd77869e4744dc1f0d61fd65421ba Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 17 Dec 2007 18:38:21 +0000 Subject: [PATCH] From Paul Obermeier, "Please find enclosed the following 2 bug fixes: File osgShadow/Version.cpp, Line 25: const char* osgShaodowGetLibraryName() should be: const char* osgShadowGetLibraryName() File CMakeModules/OsgMacroUtils.cmake, Line 224: SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) should be: SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") Otherwise setting CMAKE_DEBUG_POSTFIX to an empty string instead of "d" in the main CMakeLists.txt does not work under Linux. " --- CMakeModules/OsgMacroUtils.cmake | 2 +- src/osgShadow/Version.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index 4f63ac0d8..39250da02 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -221,7 +221,7 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP) ENDIF(${IS_COMMANDLINE_APP}) SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) IF(MSVC AND OSG_MSVC_VERSIONED_DLL) SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../") diff --git a/src/osgShadow/Version.cpp b/src/osgShadow/Version.cpp index d2f97bc4a..df291760e 100644 --- a/src/osgShadow/Version.cpp +++ b/src/osgShadow/Version.cpp @@ -22,7 +22,7 @@ const char* osgShadowGetVersion() } -const char* osgShaodowGetLibraryName() +const char* osgShadowGetLibraryName() { return "OpenSceneGraph Shadow Library"; }