Hi all,
attached patch fixes the dependency computation for libs in the cmake
build [1], e.g. it expands the dependencies of OSGDrawable from
OSGState -> OSGState;OSGSystem -> OSGBase;OSGState;OSGSystem
Currently this is just used to get the include directories right during
the build, because for linking it should suffice to have the immediate
dependencies of the lib - or is this different on windows, i.e. do you
also have to mention transitive dependencies when linking?
Or do you generally prefer to make this information explicit in the
CMakeLists.Lib.*.txt files, and update it in the (rare) case it changes?
Cheers,
Carsten
[1] this was broken from the start and I guess Gerrit's recent changes
to derive WindowGLUT from the platforms native window exposed this bug.
diff --git a/CMake/BuildFunctions.cmake b/CMake/BuildFunctions.cmake
index 9c5d945..0c7d547 100644
--- a/CMake/BuildFunctions.cmake
+++ b/CMake/BuildFunctions.cmake
@@ -1,7 +1,6 @@
-
#############################################################################
-#print message depending on the setting of OSG_VERBOSE_BUILD_MESSAGES
+# print message depending on the setting of OSG_VERBOSE_BUILD_MESSAGES
FUNCTION(OSG_MSG MSG)
IF(OSG_VERBOSE_BUILD_MESSAGES)
@@ -10,6 +9,75 @@ FUNCTION(OSG_MSG MSG)
ENDFUNCTION(OSG_MSG)
#############################################################################
+# includes _OSG_FILENAME if it exists, otherwise bails with an error.
+
+MACRO(OSG_CHECKED_INCLUDE _OSG_FILENAME)
+ IF(NOT EXISTS "${_OSG_FILENAME}")
+ MESSAGE(FATAL_ERROR "File \"${_OSG_FILENAME}\" not found, "
+ "required by ${PROJECT_NAME}\n")
+ ENDIF(NOT EXISTS "${_OSG_FILENAME}")
+
+ INCLUDE("${_OSG_FILENAME}")
+ENDMACRO(OSG_CHECKED_INCLUDE)
+
+#############################################################################
+# given a list of OpenSG libraries (BASELIST) it determines the full list of
+# OpenSG libs they depend upon.
+# Useful to get all the include dirs needed by a lib during the build.
+
+FUNCTION(OSG_GET_ALL_DEP_OSG_LIB BASELIST OUTDEPLIST)
+
+ SET(_DEPLIST ${BASELIST})
+ SET(_DEPLISTNEW )
+
+ # CMake has no do{ }while, duplicate the while loop body once
+ # outside the while loop:
+
+ FOREACH(DEP ${_DEPLIST})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${DEP}.cmake")
+
+ LIST(APPEND _DEPLISTNEW ${DEP})
+ LIST(APPEND _DEPLISTNEW ${${DEP}_DEP_OSG_LIB})
+
+ LIST(SORT _DEPLISTNEW)
+ LIST(REMOVE_DUPLICATES _DEPLISTNEW)
+ ENDFOREACH(DEP)
+
+ LIST(LENGTH _DEPLIST _DEPLISTLEN )
+ LIST(LENGTH _DEPLISTNEW _DEPLISTNEWLEN)
+
+ MESSAGE("_DEPLIST : ${_DEPLIST}" )
+ MESSAGE("_DEPLISTNEW: ${_DEPLISTNEW}")
+
+ # keep iterating as long as new elements are added
+ WHILE(${_DEPLISTNEWLEN} GREATER ${_DEPLISTLEN})
+
+ SET(_DEPLIST ${_DEPLISTNEW})
+ SET(_DEPLISTNEW )
+
+ FOREACH(DEP ${_DEPLIST})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${DEP}.cmake")
+
+ LIST(APPEND _DEPLISTNEW ${DEP} )
+ LIST(APPEND _DEPLISTNEW ${${DEP}_DEP_OSG_LIB})
+
+ LIST(SORT _DEPLISTNEW)
+ LIST(REMOVE_DUPLICATES _DEPLISTNEW)
+ ENDFOREACH(DEP)
+
+ MESSAGE("_DEPLIST : ${_DEPLIST}" )
+ MESSAGE("_DEPLISTNEW: ${_DEPLISTNEW}")
+
+ LIST(LENGTH _DEPLIST _DEPLISTLEN )
+ LIST(LENGTH _DEPLISTNEW _DEPLISTNEWLEN)
+ ENDWHILE(${_DEPLISTNEWLEN} GREATER ${_DEPLISTLEN})
+
+ SET(${OUTDEPLIST} "${_DEPLISTNEW}" PARENT_SCOPE)
+
+ENDFUNCTION(OSG_GET_ALL_DEP_OSG_LIB)
+
+
+#############################################################################
# register project with build
MACRO(OSG_ADD_PROJECT)
@@ -423,7 +491,7 @@ FUNCTION(OSG_SETUP_LIBRARY_BUILD PROJ_DEFINE)
ENDIF(NOT ${OSG_CMAKE_PASS} STREQUAL "OSGSETUP")
# read file lists
- INCLUDE(${${PROJECT_NAME}_BUILD_FILE})
+ OSG_CHECKED_INCLUDE(${${PROJECT_NAME}_BUILD_FILE})
#####
# FCD
@@ -584,18 +652,17 @@ FUNCTION(OSG_SETUP_LIBRARY_BUILD PROJ_DEFINE)
DEBUGRT_POSTFIX "_d")
# dependencies - OpenSG
- FOREACH(OSGDEP ${${PROJECT_NAME}_DEP_OSG_LIB})
- IF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
- MESSAGE(FATAL_ERROR "Dependency (${OSGDEP}) not found, "
- "can not build ${PROJECT_NAME}\n")
- RETURN()
- ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ OSG_GET_ALL_DEP_OSG_LIB(
+ "${${PROJECT_NAME}_DEP_OSG_LIB}" DEP_OSG_LIST)
- INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ FOREACH(OSGDEP ${DEP_OSG_LIST})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
INCLUDE_DIRECTORIES(${${OSGDEP}_INC})
+ ENDFOREACH(OSGDEP)
- ADD_DEPENDENCIES(${PROJECT_NAME} ${OSGDEP})
-
+ FOREACH(OSGDEP ${${PROJECT_NAME}_DEP_OSG_LIB})
+ OSG_CHECKED_INCLUDE ("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ ADD_DEPENDENCIES (${PROJECT_NAME} ${OSGDEP})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${OSGDEP})
ENDFOREACH(OSGDEP)
@@ -684,21 +751,27 @@ FUNCTION(OSG_SETUP_TEST_BUILD)
RETURN()
ENDIF(NOT ${OSG_CMAKE_PASS} STREQUAL "OSGSETUPTEST")
- INCLUDE(${${PROJECT_NAME}_BUILD_FILE})
+ OSG_CHECKED_INCLUDE(${${PROJECT_NAME}_BUILD_FILE})
INCLUDE_DIRECTORIES(${${PROJECT_NAME}_INC})
# dependencies - OpenSG
- FOREACH(OSGDEP ${${PROJECT_NAME}_DEP_OSG_LIB})
- IF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
- MESSAGE(FATAL_ERROR "Dependency (${OSGDEP}) not found, "
- "can not build tests for ${PROJECT_NAME}\n")
- RETURN()
- ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ OSG_GET_ALL_DEP_OSG_LIB(
+ "${${PROJECT_NAME}_DEP_OSG_LIB}" DEP_OSG_LIB)
- INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ FOREACH(OSGDEP ${DEP_OSG_LIB})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
INCLUDE_DIRECTORIES(${${OSGDEP}_INC})
ENDFOREACH(OSGDEP)
+ # dependencies - test OpenSG
+ OSG_GET_ALL_DEP_OSG_LIB(
+ "${${PROJECT_NAME}_DEP_TEST_OSG_LIB}" DEP_TEST_OSG_LIB)
+
+ FOREACH(OSGTESTDEP ${DEP_TEST_OSG_LIB})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${OSGTESTDEP}.cmake")
+ INCLUDE_DIRECTORIES(${${OSGTESTDEP}_INC})
+ ENDFOREACH(OSGTESTDEP)
+
# dependencies - External
FOREACH(INCDIR ${${PROJECT_NAME}_DEP_INCDIR})
OSG_MSG(" include dir ${INCDIR} = ${${INCDIR}}")
@@ -710,19 +783,6 @@ FUNCTION(OSG_SETUP_TEST_BUILD)
LINK_DIRECTORIES(${${LIBDIR}})
ENDFOREACH(LIBDIR)
- # dependencies - test OpenSG
- FOREACH(OSGTESTDEP ${${PROJECT_NAME}_DEP_TEST_OSG_LIB})
- IF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGTESTDEP}.cmake")
- MESSAGE(STATUS "Test dependency (${OSGTESTDEP}) not found, "
- "ignoring tests for ${PROJECT_NAME}\n")
-
- RETURN()
- ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGTESTDEP}.cmake")
-
- INCLUDE("${CMAKE_BINARY_DIR}/${OSGTESTDEP}.cmake")
- INCLUDE_DIRECTORIES(${${OSGTESTDEP}_INC})
- ENDFOREACH(OSGTESTDEP)
-
# dependencies - test External
FOREACH(INCDIR ${${PROJECT_NAME}_DEP_TEST_INCDIR})
OSG_MSG(" test - include dir ${INCDIR} = ${${INCDIR}}")
@@ -779,27 +839,20 @@ FUNCTION(OSG_SETUP_UNITTEST_BUILD)
INCLUDE_DIRECTORIES(${OSG_UNITTEST_INCLUDE_DIRS})
# dependencies - OpenSG
- FOREACH(OSGDEP ${${PROJECT_NAME}_DEP_OSG_LIB})
- IF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
- MESSAGE(FATAL_ERROR "Dependency (${OSGDEP}) not found, "
- "can not build tests for ${PROJECT_NAME}\n")
- RETURN()
- ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ OSG_GET_ALL_DEP_OSG_LIB(
+ "${${PROJECT_NAME}_DEP_OSG_LIB}" DEP_OSG_LIB)
- INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ FOREACH(OSGDEP ${DEP_OSG_LIB})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
INCLUDE_DIRECTORIES(${${OSGDEP}_INC})
ENDFOREACH(OSGDEP)
# dependencies - unittest OpenSG
- FOREACH(OSGDEP ${${PROJECT_NAME}_DEP_UNITTEST_OSG_LIB})
- IF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
- MESSAGE(STATUS "UnitTest dependency (${OSGDEP}) not found, "
- "ignoring unit tests for ${PROJECT_NAME}\n")
-
- RETURN()
- ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ OSG_GET_ALL_DEP_OSG_LIB(
+ "${${PROJECT_NAME}_DEP_UNITTEST_OSG_LIB}" DEP_UNITTEST_OSG_LIB)
- INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
+ FOREACH(OSGDEP ${DEP_UNITTEST_OSG_LIB})
+ OSG_CHECKED_INCLUDE("${CMAKE_BINARY_DIR}/${OSGDEP}.cmake")
INCLUDE_DIRECTORIES(${${OSGDEP}_INC})
ENDFOREACH(OSGDEP)
@@ -814,7 +867,6 @@ FUNCTION(OSG_SETUP_UNITTEST_BUILD)
LINK_DIRECTORIES(${${LIBDIR}})
ENDFOREACH(LIBDIR)
-
LINK_DIRECTORIES(${OSG_UNITTEST_LIBRARY_DIRS})
# build unittest executable
@@ -1007,3 +1059,4 @@ FUNCTION(OSG_WRITE_SETTINGS FILENAME)
ENDFOREACH(OSG_OPT ${OSG_OPTION_LIST})
ENDFUNCTION(OSG_WRITE_SETTINGS FILENAME)
+
diff --git a/Source/Contrib/BackgroundLoader/CMakeLists.Lib.OSGContribBackgroundLoader.txt b/Source/Contrib/BackgroundLoader/CMakeLists.Lib.OSGContribBackgroundLoader.txt
index 0140057..b759f42 100644
--- a/Source/Contrib/BackgroundLoader/CMakeLists.Lib.OSGContribBackgroundLoader.txt
+++ b/Source/Contrib/BackgroundLoader/CMakeLists.Lib.OSGContribBackgroundLoader.txt
@@ -9,14 +9,11 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
- OSGSystem
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGUtil)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGGroup
OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
SET(${PROJECT_NAME}_DEP_LIB OSG_BOOST_LIBS)
diff --git a/Source/Contrib/ComplexSceneManager/CMakeLists.Lib.OSGContribCSM.txt b/Source/Contrib/ComplexSceneManager/CMakeLists.Lib.OSGContribCSM.txt
index 23c2e62..db7eb9a 100644
--- a/Source/Contrib/ComplexSceneManager/CMakeLists.Lib.OSGContribCSM.txt
+++ b/Source/Contrib/ComplexSceneManager/CMakeLists.Lib.OSGContribCSM.txt
@@ -35,9 +35,7 @@ ENDIF(APPLE AND OSG_CARBON_FRAMEWORK)
##############################################################################
# depdencies start here
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGSystem
- OSGDrawable
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGWindow
OSGFileIO
OSGUtil)
diff --git a/Source/Contrib/Manipulators/CMakeLists.Lib.OSGContribGUI.txt b/Source/Contrib/Manipulators/CMakeLists.Lib.OSGContribGUI.txt
index 63d33d5..c9ee8ee 100644
--- a/Source/Contrib/Manipulators/CMakeLists.Lib.OSGContribGUI.txt
+++ b/Source/Contrib/Manipulators/CMakeLists.Lib.OSGContribGUI.txt
@@ -9,16 +9,12 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGGroup
- OSGState
- OSGSystem)
+ OSGState)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGUtil
- OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/Contrib/PLY/CMakeLists.Lib.OSGContribPLY.txt b/Source/Contrib/PLY/CMakeLists.Lib.OSGContribPLY.txt
index 5828a98..970c03a 100644
--- a/Source/Contrib/PLY/CMakeLists.Lib.OSGContribPLY.txt
+++ b/Source/Contrib/PLY/CMakeLists.Lib.OSGContribPLY.txt
@@ -9,9 +9,7 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGSystem
- OSGDrawable)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable)
# SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB)
# dependencies - External
diff --git a/Source/System/CMakeLists.Lib.OSGSystem.txt b/Source/System/CMakeLists.Lib.OSGSystem.txt
index 17b591c..53e13a5 100644
--- a/Source/System/CMakeLists.Lib.OSGSystem.txt
+++ b/Source/System/CMakeLists.Lib.OSGSystem.txt
@@ -14,9 +14,7 @@ SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGGroup
OSGState
OSGUtil
- OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
SET(${PROJECT_NAME}_DEP_UNITTEST_OSG_LIB OSGGroup)
# dependencies - External
diff --git a/Source/System/Cluster/CMakeLists.Lib.OSGCluster.txt b/Source/System/Cluster/CMakeLists.Lib.OSGCluster.txt
index 2d9bbb3..4a69ce9 100644
--- a/Source/System/Cluster/CMakeLists.Lib.OSGCluster.txt
+++ b/Source/System/Cluster/CMakeLists.Lib.OSGCluster.txt
@@ -9,15 +9,12 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGGroup
OSGState
- OSGSystem
OSGWindow)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGUtil
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/System/FileIO/CMakeLists.Lib.OSGFileIO.txt b/Source/System/FileIO/CMakeLists.Lib.OSGFileIO.txt
index 41a5362..b5516da 100644
--- a/Source/System/FileIO/CMakeLists.Lib.OSGFileIO.txt
+++ b/Source/System/FileIO/CMakeLists.Lib.OSGFileIO.txt
@@ -9,11 +9,9 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGGroup
- OSGState
- OSGSystem)
+ OSGState)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB)
# dependencies - External
diff --git a/Source/System/GraphOp/CMakeLists.Lib.OSGUtil.txt b/Source/System/GraphOp/CMakeLists.Lib.OSGUtil.txt
index d7e9ec8..ae0b1db 100644
--- a/Source/System/GraphOp/CMakeLists.Lib.OSGUtil.txt
+++ b/Source/System/GraphOp/CMakeLists.Lib.OSGUtil.txt
@@ -9,16 +9,13 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGGroup
OSGState
- OSGSystem
OSGText
OSGWindow)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGGroup
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/System/Image/FileIO/CMakeLists.Lib.OSGImageFileIO.txt b/Source/System/Image/FileIO/CMakeLists.Lib.OSGImageFileIO.txt
index 5f1529e..4b78efa 100644
--- a/Source/System/Image/FileIO/CMakeLists.Lib.OSGImageFileIO.txt
+++ b/Source/System/Image/FileIO/CMakeLists.Lib.OSGImageFileIO.txt
@@ -9,16 +9,13 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGSystem)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGSystem)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGGroup
OSGState
OSGText
OSGUtil
- OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
SET(${PROJECT_NAME}_DEP_LIB ${OSG_EXTERNAL_IMAGELIBS})
diff --git a/Source/System/NodeCores/Drawables/CMakeLists.Lib.OSGDrawable.txt b/Source/System/NodeCores/Drawables/CMakeLists.Lib.OSGDrawable.txt
index c23742b..d1fcc6b 100644
--- a/Source/System/NodeCores/Drawables/CMakeLists.Lib.OSGDrawable.txt
+++ b/Source/System/NodeCores/Drawables/CMakeLists.Lib.OSGDrawable.txt
@@ -9,15 +9,11 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGState
- OSGSystem)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGState)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGGroup
OSGUtil
- OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
SET(${PROJECT_NAME}_DEP_UNITTEST_OSG_LIB OSGGroup)
diff --git a/Source/System/NodeCores/Groups/CMakeLists.Lib.OSGGroup.txt b/Source/System/NodeCores/Groups/CMakeLists.Lib.OSGGroup.txt
index 0e93946..61dcfc2 100644
--- a/Source/System/NodeCores/Groups/CMakeLists.Lib.OSGGroup.txt
+++ b/Source/System/NodeCores/Groups/CMakeLists.Lib.OSGGroup.txt
@@ -9,14 +9,10 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGState
- OSGSystem)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGState)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGUtil
- OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/System/NodeCores/Groups/Effects/CMakeLists.Lib.OSGEffectGroups.txt b/Source/System/NodeCores/Groups/Effects/CMakeLists.Lib.OSGEffectGroups.txt
index 0631869..316a0a0 100644
--- a/Source/System/NodeCores/Groups/Effects/CMakeLists.Lib.OSGEffectGroups.txt
+++ b/Source/System/NodeCores/Groups/Effects/CMakeLists.Lib.OSGEffectGroups.txt
@@ -9,15 +9,12 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable
OSGGroup
OSGState
- OSGSystem
OSGWindow)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGUtil
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/System/State/CMakeLists.Lib.OSGState.txt b/Source/System/State/CMakeLists.Lib.OSGState.txt
index 75a1a52..540d519 100644
--- a/Source/System/State/CMakeLists.Lib.OSGState.txt
+++ b/Source/System/State/CMakeLists.Lib.OSGState.txt
@@ -9,11 +9,10 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase OSGSystem)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGSystem)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGUtil
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/System/Text/CMakeLists.Lib.OSGText.txt b/Source/System/Text/CMakeLists.Lib.OSGText.txt
index 67b94b9..1020af4 100644
--- a/Source/System/Text/CMakeLists.Lib.OSGText.txt
+++ b/Source/System/Text/CMakeLists.Lib.OSGText.txt
@@ -9,16 +9,11 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGDrawable
- OSGSystem)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGDrawable)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGGroup
OSGState
- OSGSystem
OSGUtil
- OSGWindow
- OSGWindowGLUT
- ${OSG_NATIVE_WINDOW})
+ OSGWindowGLUT)
# dependencies - External
# SET(${PROJECT_NAME}_DEP_LIB)
diff --git a/Source/System/Window/CMakeLists.Lib.OSGWindow.txt b/Source/System/Window/CMakeLists.Lib.OSGWindow.txt
index 71edef1..219470c 100644
--- a/Source/System/Window/CMakeLists.Lib.OSGWindow.txt
+++ b/Source/System/Window/CMakeLists.Lib.OSGWindow.txt
@@ -9,7 +9,8 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase OSGSystem ${OSG_NATIVE_WINDOW})
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGSystem
+ ${OSG_NATIVE_WINDOW})
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGGroup
diff --git a/Source/WindowSystem/GLUT/CMakeLists.Lib.OSGWindowGLUT.txt b/Source/WindowSystem/GLUT/CMakeLists.Lib.OSGWindowGLUT.txt
index d9c1e37..1b8f341 100644
--- a/Source/WindowSystem/GLUT/CMakeLists.Lib.OSGWindowGLUT.txt
+++ b/Source/WindowSystem/GLUT/CMakeLists.Lib.OSGWindowGLUT.txt
@@ -15,9 +15,7 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGSystem
- ${OSG_NATIVE_WINDOW})
+SET(${PROJECT_NAME}_DEP_OSG_LIB ${OSG_NATIVE_WINDOW})
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGFileIO
diff --git a/Source/WindowSystem/X/CMakeLists.Lib.OSGWindowX.txt b/Source/WindowSystem/X/CMakeLists.Lib.OSGWindowX.txt
index b9fdfbe..6bca2d3 100644
--- a/Source/WindowSystem/X/CMakeLists.Lib.OSGWindowX.txt
+++ b/Source/WindowSystem/X/CMakeLists.Lib.OSGWindowX.txt
@@ -18,8 +18,7 @@ OSG_SELECT_PROJECT()
##############################################################################
# dependencies - OpenSG
-SET(${PROJECT_NAME}_DEP_OSG_LIB OSGBase
- OSGSystem)
+SET(${PROJECT_NAME}_DEP_OSG_LIB OSGSystem)
SET(${PROJECT_NAME}_DEP_TEST_OSG_LIB OSGDrawable
OSGGroup
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Opensg-core mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensg-core
