From 4e2eaf4d0d27f85253531d5e73893241bf0dbc6d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 26 Mar 2007 09:48:02 +0000 Subject: [PATCH] Changed the external library specification to use TARGET_EXTERNAL_LIBRARIES --- examples/osgGLUTkeyboardmouse/CMakeLists.txt | 3 ++- examples/osgGLUTsimple/CMakeLists.txt | 3 ++- examples/osgsimpleviewerGLUT/CMakeLists.txt | 3 ++- examples/osgsimpleviewerQT3/CMakeLists.txt | 3 ++- examples/osgsimpleviewerQT4/CMakeLists.txt | 3 ++- examples/osgsimpleviewerSDL/CMakeLists.txt | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/examples/osgGLUTkeyboardmouse/CMakeLists.txt b/examples/osgGLUTkeyboardmouse/CMakeLists.txt index 158327263..207a09d77 100644 --- a/examples/osgGLUTkeyboardmouse/CMakeLists.txt +++ b/examples/osgGLUTkeyboardmouse/CMakeLists.txt @@ -1,5 +1,6 @@ SET(TARGET_SRC osgGLUTkeyboardmouse.cpp ) -SET(TARGET_ADDED_LIBRARIES ${GLUT_glut_LIBRARY} ) + +SET(TARGET_EXTERNAL_LIBRARIES ${GLUT_glut_LIBRARY} ) #### end var setup ### SETUP_EXAMPLE(osgGLUTkeyboardmouse) diff --git a/examples/osgGLUTsimple/CMakeLists.txt b/examples/osgGLUTsimple/CMakeLists.txt index 33a57bc0d..9c51f9f13 100644 --- a/examples/osgGLUTsimple/CMakeLists.txt +++ b/examples/osgGLUTsimple/CMakeLists.txt @@ -1,5 +1,6 @@ SET(TARGET_SRC osgGLUTsimple.cpp ) -SET(TARGET_ADDED_LIBRARIES ${GLUT_glut_LIBRARY} ) + +SET(TARGET_EXTERNAL_LIBRARIES ${GLUT_glut_LIBRARY} ) #### end var setup ### SETUP_EXAMPLE(osgGLUTsimple) diff --git a/examples/osgsimpleviewerGLUT/CMakeLists.txt b/examples/osgsimpleviewerGLUT/CMakeLists.txt index 805ee9e5f..b7b1b74a7 100644 --- a/examples/osgsimpleviewerGLUT/CMakeLists.txt +++ b/examples/osgsimpleviewerGLUT/CMakeLists.txt @@ -1,5 +1,6 @@ SET(TARGET_SRC osgsimpleviewerGLUT.cpp ) -SET(TARGET_ADDED_LIBRARIES ${GLUT_glut_LIBRARY} ) + +SET(TARGET_EXTERNAL_LIBRARIES ${GLUT_glut_LIBRARY} ) #### end var setup ### SETUP_EXAMPLE(osgsimpleviewerGLUT) diff --git a/examples/osgsimpleviewerQT3/CMakeLists.txt b/examples/osgsimpleviewerQT3/CMakeLists.txt index b825ebd5c..f16e410ed 100644 --- a/examples/osgsimpleviewerQT3/CMakeLists.txt +++ b/examples/osgsimpleviewerQT3/CMakeLists.txt @@ -1,6 +1,7 @@ SET(TARGET_SRC osgsimpleviewerQT3.cpp ) -SET(TARGET_ADDED_LIBRARIES ${QT_LIBRARIES} ) +SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} ) + INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ) #### end var setup ### diff --git a/examples/osgsimpleviewerQT4/CMakeLists.txt b/examples/osgsimpleviewerQT4/CMakeLists.txt index 38628ca87..a9e0e18a0 100644 --- a/examples/osgsimpleviewerQT4/CMakeLists.txt +++ b/examples/osgsimpleviewerQT4/CMakeLists.txt @@ -1,6 +1,7 @@ SET(TARGET_SRC osgsimpleviewerQT4.cpp ) -SET(TARGET_ADDED_LIBRARIES ${QT_LIBRARIES} ) +SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} ) + INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ) #### end var setup ### diff --git a/examples/osgsimpleviewerSDL/CMakeLists.txt b/examples/osgsimpleviewerSDL/CMakeLists.txt index ae2c2c43b..f3bbb2bf1 100644 --- a/examples/osgsimpleviewerSDL/CMakeLists.txt +++ b/examples/osgsimpleviewerSDL/CMakeLists.txt @@ -1,5 +1,6 @@ SET(TARGET_SRC osgsimpleviewerSDL.cpp ) -SET(TARGET_ADDED_LIBRARIES ${SDL_LIBRARY} ) + +SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )