Skip to content

Commit

Permalink
From Philip Lowman, "Mainly removing comments like "This file is auto…
Browse files Browse the repository at this point in the history
…matically generated" (glad that never happened!)"
  • Loading branch information
robertosfield committed Mar 23, 2009
1 parent 39cecd2 commit de80896
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 29 deletions.
24 changes: 10 additions & 14 deletions applications/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})


Expand All @@ -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()

5 changes: 1 addition & 4 deletions applications/osgarchive/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#this file is automatically generated


SET(TARGET_SRC osgarchive.cpp )
#### end var setup ###

SETUP_APPLICATION(osgarchive)
4 changes: 0 additions & 4 deletions applications/osgconv/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#this file is automatically generated


SET(TARGET_SRC
OrientationConverter.cpp
osgconv.cpp
Expand All @@ -9,5 +6,4 @@ SET(TARGET_H
OrientationConverter.h
)

#### end var setup ###
SETUP_APPLICATION(osgconv)
3 changes: 0 additions & 3 deletions applications/osgfilecache/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

SET(TARGET_SRC osgfilecache.cpp )

SET(TARGET_ADDED_LIBRARIES osgTerrain )

#### end var setup ###
SETUP_APPLICATION(osgfilecache)
5 changes: 1 addition & 4 deletions applications/osgviewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#this file is automatically generated


SET(TARGET_SRC osgviewer.cpp )
#### end var setup ###

SETUP_APPLICATION(osgviewer)

0 comments on commit de80896

Please sign in to comment.