diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index 77e379567..a8a4d6821 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -109,9 +109,10 @@ MACRO(SETUP_LINK_LIBRARIES) # TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}") # ENDFOREACH(LINKLIB) LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES}) - FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES}) - TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB}) - ENDFOREACH(LINKLIB) +# FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES}) +# TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB}) +# ENDFOREACH(LINKLIB) + TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${TARGET_EXTERNAL_LIBRARIES}) IF(TARGET_LIBRARIES_VARS) LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS}) ENDIF(TARGET_LIBRARIES_VARS) diff --git a/examples/osgQtBrowser/CMakeLists.txt b/examples/osgQtBrowser/CMakeLists.txt index 4f5ff692c..a45f96748 100644 --- a/examples/osgQtBrowser/CMakeLists.txt +++ b/examples/osgQtBrowser/CMakeLists.txt @@ -2,7 +2,7 @@ SET(TARGET_SRC osgQtBrowser.cpp ) -SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE} ${QT_QTWEBKIT_LIBRARY_RELEASE}) +SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) SET(TARGET_ADDED_LIBRARIES osgWidget osgQt) diff --git a/examples/osgviewerQT/CMakeLists.txt b/examples/osgviewerQT/CMakeLists.txt index d53b9546b..3523cef7d 100644 --- a/examples/osgviewerQT/CMakeLists.txt +++ b/examples/osgviewerQT/CMakeLists.txt @@ -5,7 +5,7 @@ SET(TARGET_SRC ) IF (QT4_FOUND) - SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE} ) + SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ) ADD_DEFINITIONS(-DUSE_QT4) ELSE(QT4_FOUND) SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} ) diff --git a/examples/osgviewerQtWidget/CMakeLists.txt b/examples/osgviewerQtWidget/CMakeLists.txt index 8725bf1dd..9c73cd56c 100644 --- a/examples/osgviewerQtWidget/CMakeLists.txt +++ b/examples/osgviewerQtWidget/CMakeLists.txt @@ -29,7 +29,7 @@ SET(TARGET_SRC ) IF (QT4_FOUND) - SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE} ) + SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ) ADD_DEFINITIONS(-DUSE_QT4) ELSE(QT4_FOUND) SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} ) diff --git a/src/osgQt/CMakeLists.txt b/src/osgQt/CMakeLists.txt index d14bd8ff9..a479abf04 100644 --- a/src/osgQt/CMakeLists.txt +++ b/src/osgQt/CMakeLists.txt @@ -41,7 +41,7 @@ LINK_INTERNAL(${LIB_NAME} OpenThreads ) -SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE} ${QT_QTWEBKIT_LIBRARY_RELEASE}) +TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) LINK_CORELIB_DEFAULT(${LIB_NAME})