FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #263 from cxw42/build-fix

Browse Source 
Still build even if CPACK_GENERATOR is undefined
This commit is contained in:
OpenSceneGraph git repository 2017-06-19 08:43:54 +01:00 committed by GitHub
commit 883567851c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/OsgMacroUtils.cmake
View File

@ -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"