From dbff652aedda98f84693cdec97bf000604b89709 Mon Sep 17 00:00:00 2001 From: cxw Date: Sat, 10 Jun 2017 22:05:19 -0400 Subject: [PATCH] Still build even if CPACK_GENERATOR is undefined Without the quotes around `${CPACK_GENERATOR}`, Windows CMake, generating for VS2013, would exit with an error because the `STREQUAL` only had one arg. --- CMakeModules/OsgMacroUtils.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index 8c7967cb5..c98a50876 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -122,9 +122,9 @@ MACRO(SETUP_LINK_LIBRARIES) FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES}) SET(TO_INSERT TRUE) FOREACH (value ${TARGET_COMMON_LIBRARIES}) - IF (${value} STREQUAL ${LINKLIB}) + IF ("${value}" STREQUAL "${LINKLIB}") SET(TO_INSERT FALSE) - ENDIF (${value} STREQUAL ${LINKLIB}) + ENDIF ("${value}" STREQUAL "${LINKLIB}") ENDFOREACH (value ${TARGET_COMMON_LIBRARIES}) IF(TO_INSERT) LIST(APPEND TARGET_LIBRARIES ${LINKLIB}) @@ -269,7 +269,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) # add cpack config variables for plugin with own package IF(BUILD_OSG_PACKAGES) - IF(${CPACK_GENERATOR} STREQUAL "DEB") + IF("${CPACK_GENERATOR}" STREQUAL "DEB") STRING(TOUPPER ${PACKAGE_COMPONENT} UPPER_PACKAGE_COMPONENT) SET(CPACK_${UPPER_PACKAGE_COMPONENT}_DEPENDENCIES "libopenscenegraph"