From Philip Lowman, clean up of CMake files

CMakeModules/CheckAtomicOps.cmake

@@ -113,6 +113,10 @@ int main()
 " _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
 
 
-IF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_SUN AND NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
+IF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND
+   NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND
+   NOT _OPENTHREADS_ATOMIC_USE_SUN AND
+   NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND
+   NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
            SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
-ENDIF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_SUN AND NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
+ENDIF()

CMakeModules/ModuleInstall.cmake

@@ -9,10 +9,10 @@ SET(INSTALL_BINDIR bin)
 IF(WIN32)
     SET(INSTALL_LIBDIR bin)
     SET(INSTALL_ARCHIVEDIR lib)
-ELSE(WIN32)
+ELSE()
     SET(INSTALL_LIBDIR lib${LIB_POSTFIX})
     SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX})
-ENDIF(WIN32)
+ENDIF()
 
 SET(HEADERS_GROUP "Header Files")
 
@@ -23,7 +23,7 @@ SOURCE_GROUP(
 
 IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
     HANDLE_MSVC_DLL()
-ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+ENDIF()
 
 INSTALL(
     TARGETS ${LIB_NAME}

CMakeModules/OsgCPack.cmake

@@ -13,9 +13,9 @@
 # require i386 so this is for the future
 IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
     SET(SYSTEM_ARCH "i386")
-ELSE("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+ELSE()
     SET(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+ENDIF()
 
 # set a default system name - use CMake setting (Linux|Windows|...)
 SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
@@ -26,23 +26,24 @@ SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
 IF(MSVC)
     IF(CMAKE_CL_64)
         SET(SYSTEM_NAME "win64")
-    ELSE(CMAKE_CL_64)
+    ELSE()
         SET(SYSTEM_NAME "win32")
-    ENDIF(CMAKE_CL_64)
+    ENDIF()
-ENDIF(MSVC)
+ENDIF()
+
 # Guess the compiler (is this desired for other platforms than windows?)
 IF(NOT DEFINED OSG_CPACK_COMPILER)
     INCLUDE(OsgDetermineCompiler)
-ENDIF(NOT DEFINED OSG_CPACK_COMPILER)
+ENDIF()
 
 # expose the compiler setting to the user
 SET(OSG_CPACK_COMPILER "${OSG_COMPILER}" CACHE STRING "This ia short string (vc90, vc80sp1, gcc-4.3, ...) describing your compiler. The string is used for creating package filenames")
 
 IF(OSG_CPACK_COMPILER)
     SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}-${OSG_CPACK_COMPILER})
-ELSE(OSG_CPACK_COMPILER)
+ELSE()
     SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH})
-ENDIF(OSG_CPACK_COMPILER)
+ENDIF()
 
 
 ## variables that apply to all packages
@@ -57,15 +58,15 @@ SET(CPACK_SOURCE_GENERATOR "TGZ")
 IF(MSVC_IDE)
     SET(OSG_CPACK_CONFIGURATION "$(OutDir)")
     SET(PACKAGE_TARGET_PREFIX "Package ")
-ELSE(MSVC_IDE)
+ELSE()
     # on un*x an empty CMAKE_BUILD_TYPE means release
     IF(CMAKE_BUILD_TYPE)
         SET(OSG_CPACK_CONFIGURATION ${CMAKE_BUILD_TYPE})
-    ELSE(CMAKE_BUILD_TYPE)
+    ELSE()
         SET(OSG_CPACK_CONFIGURATION "Release")
-    ENDIF(CMAKE_BUILD_TYPE)
+    ENDIF()
     SET(PACKAGE_TARGET_PREFIX "package_")
-ENDIF(MSVC_IDE)
+ENDIF()
 
 # Get all defined components
 GET_CMAKE_PROPERTY(CPACK_COMPONENTS_ALL COMPONENTS)
@@ -74,35 +75,39 @@ IF(NOT CPACK_COMPONENTS_ALL)
   # I set it manually to be the packages that can always be packaged
   MESSAGE("When building packages please consider using cmake version 2.6.1 or above")
   SET(CPACK_COMPONENTS_ALL libopenscenegraph libopenthreads openscenegraph libopenscenegraph-dev libopenthreads-dev)
-ENDIF(NOT CPACK_COMPONENTS_ALL)
+ENDIF()
 
 # Create a target that will be used to generate all packages defined below
 SET(PACKAGE_ALL_TARGETNAME "${PACKAGE_TARGET_PREFIX}ALL")
 ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME})
 
+#=============================
+# Macro:
+#    GENERATE_PACKAGING_TARGET()
+#
 MACRO(GENERATE_PACKAGING_TARGET package_name)
     SET(CPACK_PACKAGE_NAME ${package_name})
 
     # the doc packages don't need a system-arch specification
     IF(${package} MATCHES -doc)
         SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION})
-    ELSE(${package} MATCHES -doc)
+    ELSE()
         SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION}-${OSG_CPACK_SYSTEM_SPEC_STRING}-${OSG_CPACK_CONFIGURATION})
         IF(NOT DYNAMIC_OPENSCENEGRAPH)
             SET(OSG_PACKAGE_FILE_NAME ${OSG_PACKAGE_FILE_NAME}-static)
-        ENDIF(NOT DYNAMIC_OPENSCENEGRAPH)
+        ENDIF()
-    ENDIF(${package} MATCHES -doc)
+    ENDIF()
 
     CONFIGURE_FILE("${OpenSceneGraph_SOURCE_DIR}/CMakeModules/OsgCPackConfig.cmake.in" "${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake" IMMEDIATE)
 
     SET(PACKAGE_TARGETNAME "${PACKAGE_TARGET_PREFIX}${package_name}")
 
     # This is naive and will probably need fixing eventually
-    IF(MSVC)
+    IF(WIN32)
         SET(MOVE_COMMAND "move")
-    ELSE(MSVC)
+    ELSE()
         SET(MOVE_COMMAND "mv")
-    ENDIF(MSVC)
+    ENDIF()
     
     # Create a target that creates the current package
     # and rename the package to give it proper filename
@@ -121,6 +126,8 @@ MACRO(GENERATE_PACKAGING_TARGET package_name)
         COMMAND ${CMAKE_COMMAND} -E echo "renamed ${CPACK_PACKAGE_FILE_NAME}.tar.gz -> ${OSG_PACKAGE_FILE_NAME}.tar.gz"
     )
 ENDMACRO(GENERATE_PACKAGING_TARGET)
+#
+#=============================
 
 # Create configs and targets for a package including all components
 SET(OSG_CPACK_COMPONENT ALL)
@@ -130,4 +137,4 @@ GENERATE_PACKAGING_TARGET(openscenegraph-all)
 FOREACH(package ${CPACK_COMPONENTS_ALL})
     SET(OSG_CPACK_COMPONENT ${package})
     GENERATE_PACKAGING_TARGET(${package})
-ENDFOREACH(package ${CPACK_COMPONENTS_ALL})
+ENDFOREACH()

CMakeModules/OsgDetermineCompiler.cmake

@@ -1,36 +1,31 @@
-# - Figure out what compiler (and version) cmake is generating for
+# - If Visual Studio is being used, this script sets the variable OSG_COMPILER
-# Once done this will define:
+# The principal reason for this is due to MSVC 8.0 SP0 vs SP1 builds.
 #
 # Variable:
 #   OSG_COMPILER
 # 
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
+# Not currently used...
+#IF(CMAKE_COMPILER_IS_GNUCXX)
+#    EXEC_PROGRAM(
+#        ${CMAKE_CXX_COMPILER}  
+#        ARGS     ${CMAKE_CXX_COMPILER_ARG1} -dumpversion 
+#        OUTPUT_VARIABLE gcc_compiler_version
+#    )
+#    #MESSAGE("GCC Version: ${gcc_compiler_version}")
 
-    EXEC_PROGRAM(
-        ${CMAKE_CXX_COMPILER}  
-        ARGS     ${CMAKE_CXX_COMPILER_ARG1} -dumpversion 
-        OUTPUT_VARIABLE gcc_compiler_version
-    )
-    #MESSAGE("GCC Version: ${gcc_compiler_version}")
-
-ELSE(CMAKE_COMPILER_IS_GNUCXX)
-    IF(MSVC)
 IF(MSVC60)
     SET(OSG_COMPILER "vc60")
-        ENDIF(MSVC60)
+ELSEIF(MSVC70)
-        IF(MSVC70)
     SET(OSG_COMPILER "vc70")
-        ENDIF(MSVC70)
+ELSEIF(MSVC71)
-        IF(MSVC71)
     SET(OSG_COMPILER "vc71")
-        ENDIF(MSVC71)
+ELSEIF(MSVC80)
-        IF(MSVC80)
     SET(OSG_COMPILER "vc80")
-        ENDIF(MSVC80)
+ELSEIF(MSVC90)
-        IF(MSVC90)
     SET(OSG_COMPILER "vc90")
-        ENDIF(MSVC90)
+ENDIF()
+
 
 IF(MSVC80)
     MESSAGE(STATUS "Checking if compiler has service pack 1 installed...")
@@ -77,5 +72,3 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
         #ENDIF(MSVC_IDE)
     ENDIF(_TRY_RESULT)
 ENDIF(MSVC80)
-    ENDIF(MSVC)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)

CMakeModules/UtilityMacros.cmake

@@ -1,8 +1,9 @@
 
 INCLUDE(ListHandle)
 
-
+#---------------------------------------------------
-  MACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
+# Macro: FILTER_OUT FILTERS INPUTS OUTPUT
+#
 # Mimicks Gnu Make's $(filter-out) which removes elements 
 # from a list that match the pattern.
 # Arguments:
@@ -20,24 +21,32 @@ INCLUDE(ListHandle)
 # The output - 
 #   OUTPUT = and;the;other
 #
+#---------------------------------------------------
+MACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
     SET(FOUT "")
     FOREACH(INP ${INPUTS})
         SET(FILTERED 0)
+
         FOREACH(FILT ${FILTERS})
             IF(${FILTERED} EQUAL 0)
                 IF("${FILT}" STREQUAL "${INP}")
                     SET(FILTERED 1)
-                   ENDIF("${FILT}" STREQUAL "${INP}")
+                ENDIF()
-               ENDIF(${FILTERED} EQUAL 0)
+            ENDIF()
-           ENDFOREACH(FILT ${FILTERS})
+        ENDFOREACH()
+
         IF(${FILTERED} EQUAL 0)
             SET(FOUT ${FOUT} ${INP})
-           ENDIF(${FILTERED} EQUAL 0)
+        ENDIF()
+
     ENDFOREACH(INP ${INPUTS})
     SET(${OUTPUT} ${FOUT})
-   ENDMACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
+ENDMACRO()
-
 
+#---------------------------------------------------
+# Macro: GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT
+#
+#---------------------------------------------------
 MACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT)
     FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" )
     #FOREACH(F ${TMP})
@@ -46,7 +55,12 @@ INCLUDE(ListHandle)
     FILTER_OUT("${DIR}/CVS" "${TMP}" TMP)
     FILTER_OUT("${DIR}/cvs" "${TMP}" ${OUTPUT})
     FILTER_OUT("${DIR}/.svn" "${TMP}" ${OUTPUT})
-   ENDMACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT)
+ENDMACRO()
+
+#---------------------------------------------------
+# Macro: ADD_DIRS_TO_ENV_VAR _VARNAME
+#
+#---------------------------------------------------
    
 MACRO(ADD_DIRS_TO_ENV_VAR _VARNAME )
     FOREACH(_ADD_PATH ${ARGN}) 
@@ -56,16 +70,17 @@ MACRO(ADD_DIRS_TO_ENV_VAR _VARNAME )
         #SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE}
         IF(WIN32)
             SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}")
-    ELSE(WIN32)
+        ELSE()
             SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}")
-    ENDIF(WIN32)
+        ENDIF()
         #MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---")
- ENDFOREACH(_ADD_PATH)
+    ENDFOREACH()
-ENDMACRO(ADD_DIRS_TO_ENV_VAR _VARNAME )
+ENDMACRO()
 
 #---------------------------------------------------
-# MACRO CORRECT_PATH VAR PATH 
+# Macro: CORRECT_PATH VAR PATH 
-# corrects slashes in PATH to be cmake conformous ( / ) 
+# 
+# Corrects slashes in PATH to be cmake conformous ( / ) 
 # and puts result in VAR 
 #---------------------------------------------------
 
@@ -73,13 +88,23 @@ MACRO(CORRECT_PATH VAR PATH)
     SET(${VAR} ${PATH})
     IF(WIN32)    
         STRING(REGEX REPLACE "/" "\\\\" ${VAR} "${PATH}")
-ENDIF(WIN32)    
+    ENDIF()    
-ENDMACRO(CORRECT_PATH)
+ENDMACRO()
+
+#---------------------------------------------------
+# Macro: TARGET_LOCATIONS_SET_FILE FILE
+# TODO: Ok, this seems a bit ridiculuous.
+#---------------------------------------------------
 
 MACRO(TARGET_LOCATIONS_SET_FILE FILE)
     SET(ACCUM_FILE_TARGETS ${FILE})
     FILE(WRITE ${ACCUM_FILE_TARGETS} "")
-ENDMACRO(TARGET_LOCATIONS_SET_FILE FILE)
+ENDMACRO()
+
+#---------------------------------------------------
+# Macro: TARGET_LOCATIONS_ACCUM TARGET_NAME
+# 
+#---------------------------------------------------
 
 MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME)
     IF(ACCUM_FILE_TARGETS)
@@ -89,21 +114,29 @@ MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME)
             #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll")
             #MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--")
             #SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION})
-  ENDIF(EXISTS ${ACCUM_FILE_TARGETS})
+        ENDIF()
- ENDIF(ACCUM_FILE_TARGETS)
+    ENDIF()
-ENDMACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME)
+ENDMACRO()
+
+#---------------------------------------------------
+# Macro: TARGET_LOCATIONS_GET_LIST _VAR
+# 
+#---------------------------------------------------
 
 MACRO(TARGET_LOCATIONS_GET_LIST _VAR)
     IF(ACCUM_FILE_TARGETS)
         IF(EXISTS ${ACCUM_FILE_TARGETS})
             FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR})    
         ENDIF(EXISTS ${ACCUM_FILE_TARGETS})
- ENDIF(ACCUM_FILE_TARGETS)
+    ENDIF()
-ENDMACRO(TARGET_LOCATIONS_GET_LIST _VAR)
+ENDMACRO()
 
+#---------------------------------------------------
+# Macro: FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST
+# 
+#---------------------------------------------------
 
 MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST)
-
     MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--")
 
     SET(MY_PATH_INCLUDE )
@@ -114,7 +147,7 @@ FOREACH( MYPATH ${SEARCHPATHLIST} )
         SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
         SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
         SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin)
-ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
+    ENDFOREACH()
 
     SET(MYLIBRARY "${LIBRARY}")
     SEPARATE_ARGUMENTS(MYLIBRARY)
@@ -144,12 +177,12 @@ IF(${DEPNAME}_LIBRARY)
                 IF(MYPATH MATCHES ${MYBINPATH})
                     SET(MYFOUND 1)
                     #MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--")
-            ENDIF(MYPATH MATCHES ${MYBINPATH})
+                ENDIF()
-        ENDFOREACH(MYPATH )
+            ENDFOREACH()
             IF(MYFOUND EQUAL 0)
                 SET(MY_ACCUM_BINARY_DEP ${MY_ACCUM_BINARY_DEP} ${MYBINPATH})
-        ENDIF(MYFOUND EQUAL 0)
+            ENDIF()
-    ENDIF(EXISTS ${MYBINPATH})
+        ENDIF()
         #MESSAGE("${DEPNAME}_BINDEP searching -->${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}<--in-->${MY_PATH_BIN}<--")
         #    FIND_FILE("${DEPNAME}_BINDEP" 
         #        ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}
@@ -159,22 +192,29 @@ IF(${DEPNAME}_LIBRARY)
         #        NAMES ${MYLIBRARY}
         #      PATHS ${MY_PATH_BIN}
         #    )
-ENDIF(${DEPNAME}_LIBRARY)
+    ENDIF()
+
     MARK_AS_ADVANCED("${DEPNAME}_LIBRARY")
     #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--")
     IF(${DEPNAME}_INCLUDE_DIR)
         IF(${DEPNAME}_LIBRARY)
             SET( ${DEPNAME}_FOUND "YES" )
             SET( ${DEPNAME}_LIBRARIES ${${DEPNAME}_LIBRARY} )
-  ENDIF(${DEPNAME}_LIBRARY)
+        ENDIF()
-ENDIF(${DEPNAME}_INCLUDE_DIR)
+    ENDIF()
-ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST)
+ENDMACRO()
+
+#---------------------------------------------------
+# Macro: MACRO_MESSAGE MYTEXT
+#
+#---------------------------------------------------
 
 #SET(MACRO_MESSAGE_DEBUG TRUE)
 MACRO(MACRO_MESSAGE MYTEXT)
     IF(MACRO_MESSAGE_DEBUG)
         MESSAGE("in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message  ${MYTEXT}")
-    ELSE(MACRO_MESSAGE_DEBUG)
+    ELSE()
         MESSAGE(STATUS "in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message  ${MYTEXT}")
-    ENDIF(MACRO_MESSAGE_DEBUG)
+    ENDIF()
-ENDMACRO(MACRO_MESSAGE MYTEXT)
+ENDMACRO()
+

CMakeModules/cmake_uninstall.cmake.in

@@ -1,9 +1,10 @@
 IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
     MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ENDIF()
 
 FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 STRING(REGEX REPLACE "\n" ";" files "${files}")
+
 FOREACH(file ${files})
     MESSAGE(STATUS "Uninstalling \"${file}\"")
     IF(EXISTS "${file}")
@@ -12,11 +13,10 @@ FOREACH(file ${files})
             OUTPUT_VARIABLE rm_out
             RETURN_VALUE rm_retval
             )
-    IF("${rm_retval}" STREQUAL 0)
+        IF(NOT "${rm_retval}" STREQUAL 0)
-    ELSE("${rm_retval}" STREQUAL 0)
             MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-    ENDIF("${rm_retval}" STREQUAL 0)
+        ENDIF()
-  ELSE(EXISTS "${file}")
+    ELSE()
         MESSAGE(STATUS "File \"${file}\" does not exist.")
-  ENDIF(EXISTS "${file}")
+    ENDIF()
-ENDFOREACH(file)
+ENDFOREACH()

src/osgPlugins/3dc/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriter3DC.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(3dc)

src/osgPlugins/3ds/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     ReaderWriter3DS.cpp
     atmosphere.cpp

src/osgPlugins/OpenFlight/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     AncillaryRecords.cpp
     AttrData.cpp

src/osgPlugins/ac/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC Exception.cpp Geode.cpp ac3d.cpp )
 SET(TARGET_H Exception.h Geode.h )
 #### end var setup  ###

src/osgPlugins/bmp/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterBMP.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(bmp)

src/osgPlugins/bvh/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterBVH.cpp )
 
 SET(TARGET_ADDED_LIBRARIES osgAnimation )

src/osgPlugins/curl/CMakeLists.txt

@@ -8,15 +8,15 @@ IF(WIN32)
     IF(CURL_IS_STATIC)
         ADD_DEFINITIONS(-DCURL_STATICLIB)
         SET(TARGET_EXTERNAL_LIBRARIES ws2_32 winmm wldap32)
-    ENDIF(CURL_IS_STATIC)
+    ENDIF()
-ENDIF(WIN32)
+ENDIF()
 
 IF(ZLIB_FOUND)
     ADD_DEFINITIONS(-DUSE_ZLIB)
     INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
-ELSE(ZLIB_FOUND)
+ELSE()
     INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIRS} )
-ENDIF(ZLIB_FOUND)
+ENDIF()
 
 
 SET(TARGET_SRC 
@@ -29,9 +29,9 @@ SET(TARGET_H
 
 IF(ZLIB_FOUND)
     SET(TARGET_LIBRARIES_VARS CURL_LIBRARY ZLIB_LIBRARY)
-ELSE(ZLIB_FOUND)
+ELSE()
     SET(TARGET_LIBRARIES_VARS CURL_LIBRARY )
-ENDIF(ZLIB_FOUND)
+ENDIF()
 
 
 #### end var setup  ###

src/osgPlugins/dae/CMakeLists.txt

@@ -1,8 +1,8 @@
 IF (WIN32)
     INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4 ${COLLADA_BOOST_INCLUDE_DIR} )
-ELSE (WIN32)
+ELSE ()
     INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
-ENDIF (WIN32)
+ENDIF ()
 
 SET(TARGET_SRC
     daeReader.cpp
@@ -28,34 +28,44 @@ SET(TARGET_H
 
 
 IF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
-
     OPTION(COLLADA_USE_STATIC "Set to ON to build OpenSceneGraph with static Collada support." OFF)
-
+ELSEIF(COLLADA_STATIC_LIBRARY)
-ELSE(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
-
-    IF   (COLLADA_STATIC_LIBRARY)
     SET(COLLADA_USE_STATIC "YES")
-    ELSE(COLLADA_STATIC_LIBRARY)
+ELSE()
     SET(COLLADA_USE_STATIC "NO")
-    ENDIF(COLLADA_STATIC_LIBRARY)
+ENDIF()
-
-ENDIF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
 
 IF(COLLADA_USE_STATIC)
     IF(WIN32)
         ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
-        SET(TARGET_LIBRARIES_VARS COLLADA_STATIC_LIBRARY COLLADA_LIBXML_LIBRARY COLLADA_ZLIB_LIBRARY COLLADA_PCRECPP_LIBRARY COLLADA_PCRE_LIBRARY COLLADA_MINIZIP_LIBRARY COLLADA_BOOST_FILESYSTEM_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)
+        SET(TARGET_LIBRARIES_VARS
-    ELSE(WIN32)
+            COLLADA_STATIC_LIBRARY
-        SET(TARGET_LIBRARIES_VARS COLLADA_STATIC_LIBRARY COLLADA_LIBXML_LIBRARY COLLADA_PCRECPP_LIBRARY  COLLADA_BOOST_FILESYSTEM_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)    
+            COLLADA_LIBXML_LIBRARY
-    ENDIF(WIN32)
+            COLLADA_ZLIB_LIBRARY
-ELSE (COLLADA_USE_STATIC)
+            COLLADA_PCRECPP_LIBRARY
+            COLLADA_PCRE_LIBRARY
+            COLLADA_MINIZIP_LIBRARY
+            COLLADA_BOOST_FILESYSTEM_LIBRARY
+            COLLADA_BOOST_SYSTEM_LIBRARY)
+    ELSE()
+        SET(TARGET_LIBRARIES_VARS
+            COLLADA_STATIC_LIBRARY
+            COLLADA_LIBXML_LIBRARY
+            COLLADA_PCRECPP_LIBRARY
+            COLLADA_BOOST_FILESYSTEM_LIBRARY
+            COLLADA_BOOST_SYSTEM_LIBRARY)    
+    ENDIF()
+ELSE()
     IF(WIN32)
         ADD_DEFINITIONS(-DDOM_DYNAMIC -DBOOST_ALL_NO_LIB)
-        SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)
+        SET(TARGET_LIBRARIES_VARS
-    ELSE(WIN32)
+            COLLADA_DYNAMIC_LIBRARY
-        SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY)
+            COLLADA_BOOST_SYSTEM_LIBRARY)
-    ENDIF(WIN32) 
+    ELSE()
-ENDIF(COLLADA_USE_STATIC)
+        SET(TARGET_LIBRARIES_VARS
+            COLLADA_DYNAMIC_LIBRARY)
+    ENDIF() 
+ENDIF()
  
 SET(TARGET_ADDED_LIBRARIES osgSim ) 
 

src/osgPlugins/dds/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterDDS.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(dds)

src/osgPlugins/dicom/CMakeLists.txt

@@ -1,5 +1,4 @@
 IF(DCMTK_FOUND)
-
     # note, we have to include a '/' in front of the directory string to prevent a CMake bug from ignoring the directory
     INCLUDE_DIRECTORIES(/${DCMTK_ROOT_INCLUDE_DIR})
 
@@ -9,9 +8,7 @@ IF  (DCMTK_FOUND)
 
     ADD_DEFINITIONS(-DUSE_DCMTK)
 
-ELSE(DCMTK_FOUND)
+ELSEIF(ITK_FOUND)
-
-    IF (ITK_FOUND)
 
     INCLUDE(${ITK_USE_FILE})
 
@@ -27,9 +24,7 @@ ELSE(DCMTK_FOUND)
 
     ADD_DEFINITIONS(-DUSE_ITK)
 
-    ENDIF(ITK_FOUND)
+ENDIF()
-
-ENDIF(DCMTK_FOUND)
 
 SET(TARGET_ADDED_LIBRARIES osgVolume )
 

src/osgPlugins/dot/CMakeLists.txt

@@ -1,5 +1,3 @@
-#this file is automatically generated by rschmidt
-
 SET(TARGET_SRC SimpleDotVisitor.cpp BaseDotVisitor.cpp ReaderWriterDOT.cpp)
 
 #### end var setup  ###

src/osgPlugins/dw/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterDW.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(dw)

src/osgPlugins/freetype/CMakeLists.txt

@@ -1,18 +1,22 @@
-#this file is automatically generated 
-
-
 IF(WIN32)
     SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
-ENDIF(WIN32)
+ENDIF()
 
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
 
 IF(APPLE)
   SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-ENDIF(APPLE)
+ENDIF()
 
-SET(TARGET_SRC FreeTypeFont.cpp FreeTypeFont3D.cpp FreeTypeLibrary.cpp ReaderWriterFreeType.cpp )
+SET(TARGET_SRC
-SET(TARGET_H FreeTypeFont.h FreeTypeFont3D.h FreeTypeLibrary.h )
+    FreeTypeFont.cpp
+    FreeTypeFont3D.cpp
+    FreeTypeLibrary.cpp
+    ReaderWriterFreeType.cpp )
+SET(TARGET_H
+    FreeTypeFont.h
+    FreeTypeFont3D.h
+    FreeTypeLibrary.h )
 SET(TARGET_ADDED_LIBRARIES osgText )
 SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
 #### end var setup  ###

src/osgPlugins/gecko/CMakeLists.txt

@@ -48,16 +48,12 @@ SET(ALL_REQUIRED_XUL_INCLUDE_DIRS
 )
 
 IF(WIN32 OR APPLE)
-
     INCLUDE_DIRECTORIES(${ALL_REQUIRED_XUL_INCLUDE_DIRS} )
     SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES})
-
+ELSE() 
-ELSE(WIN32 OR APPLE) 
-
     INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${ALL_REQUIRED_XUL_INCLUDE_DIRS} )
     SET(TARGET_EXTERNAL_LIBRARIES ${GTK_LIBRARIES} ${XUL_LIBRARIES})
-
+ENDIF()
-ENDIF(WIN32 OR APPLE)
 
 
 IF(CMAKE_COMPILER_IS_GNUCXX)

src/osgPlugins/geo/CMakeLists.txt

@@ -1,7 +1,7 @@
-#this file is automatically generated 
+SET(TARGET_SRC
-
+    ClipRegion.cpp
-
+    ReaderWriterGEO.cpp
-SET(TARGET_SRC ClipRegion.cpp ReaderWriterGEO.cpp geoActions.cpp )
+    geoActions.cpp )
 SET(TARGET_H
     ClipRegion.h
     geoCore.h

src/osgPlugins/gif/CMakeLists.txt

@@ -1,9 +1,5 @@
-#this file is automatically generated 
-
-
 INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
 
-
 SET(TARGET_SRC ReaderWriterGIF.cpp )
 SET(TARGET_LIBRARIES_VARS GIFLIB_LIBRARY )
 #### end var setup  ###
@@ -11,5 +7,4 @@ SETUP_PLUGIN(gif)
 
 IF(MSVC)
     SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
-ENDIF(MSVC)
+ENDIF()
-

src/osgPlugins/glsl/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterGLSL.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(glsl)

src/osgPlugins/gz/CMakeLists.txt

@@ -1,4 +1,3 @@
-#this file is automatically generated 
 INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} )
 
 SET(TARGET_SRC 

src/osgPlugins/hdr/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     ReaderWriterHDR.cpp
     hdrloader.cpp

src/osgPlugins/ive/CMakeLists.txt

@@ -1,7 +1,7 @@
 IF(ZLIB_FOUND)
     ADD_DEFINITIONS(-DUSE_ZLIB)
     INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR})
-ENDIF(ZLIB_FOUND)
+ENDIF()
 
 
 SET(TARGET_SRC
@@ -242,7 +242,7 @@ SET(TARGET_ADDED_LIBRARIES osgSim osgFX osgText osgTerrain)
 
 IF(ZLIB_FOUND)
     SET(TARGET_LIBRARIES_VARS ZLIB_LIBRARY)
-ENDIF(ZLIB_FOUND)
+ENDIF()
 
 #### end var setup  ###
 SETUP_PLUGIN(ive)

src/osgPlugins/jp2/CMakeLists.txt

@@ -6,7 +6,7 @@ SET(TARGET_LIBRARIES_VARS JASPER_LIBRARY )
 
 IF(WIN32)
    ADD_DEFINITIONS(-DJAS_WIN_MSVC_BUILD)
-ENDIF(WIN32)
+ENDIF()
 
 
 #### end var setup  ###

src/osgPlugins/jpeg/CMakeLists.txt

@@ -1,9 +1,5 @@
-#this file is automatically generated 
-
-
 INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
 
-
 SET(TARGET_SRC ReaderWriterJPEG.cpp )
 SET(TARGET_LIBRARIES_VARS JPEG_LIBRARY )
 #### end var setup  ###

src/osgPlugins/logo/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterLOGO.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(logo)

src/osgPlugins/lws/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterLWS.cpp SceneLoader.cpp )
 SET(TARGET_H SceneLoader.h )
 #### end var setup  ###

src/osgPlugins/md2/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterMD2.cpp )
 SET(TARGET_H anorms.h )
 #### end var setup  ###

src/osgPlugins/net/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterNET.cpp sockinet.cpp sockstream.cpp )
 SET(TARGET_H sockinet.h sockstream.h )
 SET(TARGET_EXTERNAL_LIBRARIES ${OSG_SOCKET_LIBS} )

src/osgPlugins/obj/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     OBJWriterNodeVisitor.cpp
     ReaderWriterOBJ.cpp

src/osgPlugins/osg/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     AlphaFunc.cpp
     AnimationPath.cpp

src/osgPlugins/osgFX/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     IO_AnisotropicLighting.cpp
     IO_BumpMapping.cpp
@@ -10,6 +7,7 @@ IO_MultiTextureControl.cpp
     IO_Scribe.cpp
     IO_SpecularHighlights.cpp
 )
+
 SET(TARGET_ADDED_LIBRARIES osgFX )
 #### end var setup  ###
 SETUP_PLUGIN(osgfx)

src/osgPlugins/osgParticle/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     IO_AccelOperator.cpp
     IO_AngularAccelOperator.cpp
@@ -34,6 +31,7 @@ IO_SmokeEffect.cpp
     IO_SmokeTrailEffect.cpp
     IO_VariableRateCounter.cpp
 )
+
 SET(TARGET_ADDED_LIBRARIES osgParticle )
 #### end var setup  ###
 SETUP_PLUGIN(osgparticle)

src/osgPlugins/osgTerrain/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC 
     Locator.cpp
     ImageLayer.cpp

src/osgPlugins/osgText/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC IO_TextBase.cpp IO_Text.cpp IO_Text3D.cpp )
 SET(TARGET_ADDED_LIBRARIES osgText )
 #### end var setup  ###

src/osgPlugins/osgWidget/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC 
     Box.cpp
     EmbeddedWindow.cpp

src/osgPlugins/osga/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC OSGA_Archive.cpp ReaderWriterOSGA.cpp )
 SET(TARGET_H OSGA_Archive.h )
 #### end var setup  ###

src/osgPlugins/osgtgz/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterOSGTGZ.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(osgtgz)

src/osgPlugins/pfb/CMakeLists.txt

@@ -13,11 +13,11 @@ IF(MSVC)
     SET(TARGET_EXTERNAL_LIBRARIES 
             libpfdu-util
     )
-ELSE(MSVC)
+ELSE()
     SET(TARGET_EXTERNAL_LIBRARIES 
             pfdu pfutil
     )
-ENDIF(MSVC)
+ENDIF()
 
 SET(TARGET_LIBRARIES_VARS PERFORMER_LIBRARY )
 

src/osgPlugins/pic/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterPIC.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(pic)

src/osgPlugins/png/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 
 
@@ -11,5 +8,5 @@ SETUP_PLUGIN(png)
 
 IF(MSVC)
     SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
-ENDIF(MSVC)
+ENDIF()
 

src/osgPlugins/quicktime/CMakeLists.txt

@@ -1,6 +1,6 @@
 IF(WIN32)
     SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
-ENDIF(WIN32)
+ENDIF()
 
 INCLUDE_DIRECTORIES(${QUICKTIME_INCLUDE_DIR})
 

src/osgPlugins/rgb/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterRGB.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(rgb)

src/osgPlugins/rot/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterROT.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(rot)

src/osgPlugins/scale/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterSCALE.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(scale)

src/osgPlugins/shp/CMakeLists.txt

@@ -1,5 +1,14 @@
-SET(TARGET_SRC ESRIShape.cpp ESRIShapeParser.cpp ESRIShapeReaderWriter.cpp XBaseParser.cpp)
+SET(TARGET_SRC
-SET(TARGET_H ESRIShape.h ESRIShapeParser.h XBaseParser.h)
+    ESRIShape.cpp
-SET(TARGET_ADDED_LIBRARIES osgSim osgTerrain)
+    ESRIShapeParser.cpp
+    ESRIShapeReaderWriter.cpp
+    XBaseParser.cpp)
+SET(TARGET_H
+    ESRIShape.h
+    ESRIShapeParser.h
+    XBaseParser.h)
+SET(TARGET_ADDED_LIBRARIES
+    osgSim
+    osgTerrain)
 #### end var setup  ###
 SETUP_PLUGIN(shp)

src/osgPlugins/stl/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterSTL.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(stl)

src/osgPlugins/svg/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 INCLUDE_DIRECTORIES( ${RSVG_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS})
 LINK_DIRECTORIES(${RSVG_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS})
 LINK_LIBRARIES(${RSVG_LIBRARIES} ${CAIRO_LIBRARIES})

src/osgPlugins/tga/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterTGA.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(tga)

src/osgPlugins/tgz/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterTGZ.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(tgz)

src/osgPlugins/trans/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterTRANS.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(trans)

src/osgPlugins/txp/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC
     ReaderWriterTXP.cpp
     TileMapper.cpp

src/osgPlugins/vnc/CMakeLists.txt

@@ -2,7 +2,10 @@ SET(TARGET_SRC ReaderWriterVNC.cpp )
 
 INCLUDE_DIRECTORIES(${LIBVNCCLIENT_INCLUDE_DIR})
 
-SET(TARGET_EXTERNAL_LIBRARIES ${LIBVNCCLIENT_LIBRARY} ${ZLIB_LIBRARY} ${JPEG_LIBRARY} )
+SET(TARGET_EXTERNAL_LIBRARIES
+    ${LIBVNCCLIENT_LIBRARY}
+    ${ZLIB_LIBRARY}
+    ${JPEG_LIBRARY} )
 
 SET(TARGET_ADDED_LIBRARIES osgWidget )
 

src/osgPlugins/vrml/CMakeLists.txt

@@ -1,15 +1,37 @@
+INCLUDE_DIRECTORIES(${OPENVRML_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OPENVRML_INCLUDE_DIR}/openvrml)
+
 IF (WIN32)
-    INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+    INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
-    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY NAMES antlr.lib PATHS $ENV{OPENVRML_DIR}/lib)
+    INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
-    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY_DEBUG NAMES antlrd.lib PATHS $ENV{OPENVRML_DIR}/lib)
+    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY NAMES regex.lib PATHS $ENV{OPENVRML_DIR}/lib)
+
-    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY_DEBUG NAMES regexd.lib PATHS $ENV{OPENVRML_DIR}/lib)
+    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY
-    SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
+        NAMES antlr.lib
-    SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib)
+        PATHS $ENV{OPENVRML_DIR}/lib)
-ELSE(WIN32)
+    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY_DEBUG
-    INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml)
+        NAMES antlrd.lib
-    SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY)
+        PATHS $ENV{OPENVRML_DIR}/lib)
-ENDIF(WIN32)
+    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY
+        NAMES regex.lib
+        PATHS $ENV{OPENVRML_DIR}/lib)
+    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY_DEBUG
+        NAMES regexd.lib
+        PATHS $ENV{OPENVRML_DIR}/lib)
+    
+    SET(TARGET_LIBRARIES_VARS
+        OPENVRML_ANTLR_LIBRARY
+        OPENVRML_REGEX_LIBRARY
+        OPENVRML_LIBRARY
+        JPEG_LIBRARY
+        PNG_LIBRARY
+        ZLIB_LIBRARY)
+    SET(TARGET_EXTERNAL_LIBRARIES
+        Ws2_32.lib)
+ELSE()
+    SET(TARGET_LIBRARIES_VARS
+        OPENVRML_LIBRARY)
+ENDIF()
 
 SET(TARGET_SRC 
     IndexedFaceSet.cpp

src/osgPlugins/vtf/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterVTF.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(vtf)

src/osgPlugins/x/CMakeLists.txt

@@ -1,7 +1,11 @@
-#this file is automatically generated 
+SET(TARGET_SRC
-
+    ReaderWriterDirectX.cpp
-
+    directx.cpp
-SET(TARGET_SRC ReaderWriterDirectX.cpp directx.cpp mesh.cpp types.cpp )
+    mesh.cpp
-SET(TARGET_H directx.h mesh.h types.h )
+    types.cpp )
+SET(TARGET_H
+    directx.h
+    mesh.h
+    types.h )
 #### end var setup  ###
 SETUP_PLUGIN(x)

src/osgPlugins/xine/CMakeLists.txt

@@ -9,7 +9,7 @@ SET(TARGET_LIBRARIES_VARS XINE_LIBRARY )
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF()
 
 
 #### end var setup  ###

src/osgPlugins/zip/CMakeLists.txt

@@ -1,6 +1,3 @@
-#this file is automatically generated 
-
-
 SET(TARGET_SRC ReaderWriterZIP.cpp )
 #### end var setup  ###
 SETUP_PLUGIN(zip)