From de8089653be05e236d5c548ce0d45e0ff038916b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 23 Mar 2009 16:05:42 +0000 Subject: [PATCH] From Philip Lowman, "Mainly removing comments like "This file is automatically generated" (glad that never happened!)" --- applications/CMakeLists.txt | 24 ++++++++++-------------- applications/osgarchive/CMakeLists.txt | 5 +---- applications/osgconv/CMakeLists.txt | 4 ---- applications/osgfilecache/CMakeLists.txt | 3 --- applications/osgviewer/CMakeLists.txt | 5 +---- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 264d0b9a6..349582efd 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -3,14 +3,14 @@ PROJECT(OSG_APPLICATIONS) SET(OSGCORE_BUNDLED TRUE) IF(NOT OSGCORE_BUNDLED) - FIND_PACKAGE(OSGCORE) - IF(OSGCORE_FOUND) - INCLUDE(${OSGCORE_USE_FILE}) - ELSE(OSGCORE_FOUND) - MESSAGE(ERROR "OSGCORE neeeded but NOT FOUND") - ENDIF(OSGCORE_FOUND) - SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../Macros) -ENDIF(NOT OSGCORE_BUNDLED) + FIND_PACKAGE(OSGCORE) + IF(OSGCORE_FOUND) + INCLUDE(${OSGCORE_USE_FILE}) + ELSE() + MESSAGE(ERROR "OSGCORE neeeded but NOT FOUND") + ENDIF() + SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../Macros) +ENDIF() SET(OPENSCENEGRAPH_APPLICATION_DIR ${PROJECT_SOURCE_DIR}) @@ -27,19 +27,15 @@ SET(TARGET_COMMON_LIBRARIES ) IF(DYNAMIC_OPENSCENEGRAPH) - ADD_SUBDIRECTORY(osgviewer) ADD_SUBDIRECTORY(osgarchive) ADD_SUBDIRECTORY(osgconv) ADD_SUBDIRECTORY(osgfilecache) ADD_SUBDIRECTORY(osgversion) - -ELSE(DYNAMIC_OPENSCENEGRAPH) - +ELSE() # need to define this on win32 or linker cries about _declspecs ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) ADD_SUBDIRECTORY(osgversion) - -ENDIF(DYNAMIC_OPENSCENEGRAPH) +ENDIF() diff --git a/applications/osgarchive/CMakeLists.txt b/applications/osgarchive/CMakeLists.txt index 64ce91a9e..2ec40a152 100644 --- a/applications/osgarchive/CMakeLists.txt +++ b/applications/osgarchive/CMakeLists.txt @@ -1,6 +1,3 @@ -#this file is automatically generated - - SET(TARGET_SRC osgarchive.cpp ) -#### end var setup ### + SETUP_APPLICATION(osgarchive) diff --git a/applications/osgconv/CMakeLists.txt b/applications/osgconv/CMakeLists.txt index a4d075abd..4668b11e6 100644 --- a/applications/osgconv/CMakeLists.txt +++ b/applications/osgconv/CMakeLists.txt @@ -1,6 +1,3 @@ -#this file is automatically generated - - SET(TARGET_SRC OrientationConverter.cpp osgconv.cpp @@ -9,5 +6,4 @@ SET(TARGET_H OrientationConverter.h ) -#### end var setup ### SETUP_APPLICATION(osgconv) diff --git a/applications/osgfilecache/CMakeLists.txt b/applications/osgfilecache/CMakeLists.txt index 3e2582532..4997a61f2 100644 --- a/applications/osgfilecache/CMakeLists.txt +++ b/applications/osgfilecache/CMakeLists.txt @@ -1,7 +1,4 @@ - SET(TARGET_SRC osgfilecache.cpp ) - SET(TARGET_ADDED_LIBRARIES osgTerrain ) -#### end var setup ### SETUP_APPLICATION(osgfilecache) diff --git a/applications/osgviewer/CMakeLists.txt b/applications/osgviewer/CMakeLists.txt index d3b7b576d..02ce87ce1 100644 --- a/applications/osgviewer/CMakeLists.txt +++ b/applications/osgviewer/CMakeLists.txt @@ -1,6 +1,3 @@ -#this file is automatically generated - - SET(TARGET_SRC osgviewer.cpp ) -#### end var setup ### + SETUP_APPLICATION(osgviewer)