Changeset 9998

Show
Ignore:
Timestamp:
04/09/09 11:23:45 (6 years ago)
Author:
robert
Message:

From Philip Lowman, clean up of CMake files

Location:
OpenSceneGraph/trunk
Files:
62 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeModules/CheckAtomicOps.cmake

    r9077 r9998  
    114114 
    115115 
    116 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) 
    117   SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1) 
    118 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) 
     116IF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND 
     117   NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND 
     118   NOT _OPENTHREADS_ATOMIC_USE_SUN AND 
     119   NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND 
     120   NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) 
     121           SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1) 
     122ENDIF() 
  • OpenSceneGraph/trunk/CMakeModules/ModuleInstall.cmake

    r9342 r9998  
    1010    SET(INSTALL_LIBDIR bin) 
    1111    SET(INSTALL_ARCHIVEDIR lib) 
    12 ELSE(WIN32) 
     12ELSE() 
    1313    SET(INSTALL_LIBDIR lib${LIB_POSTFIX}) 
    1414    SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX}) 
    15 ENDIF(WIN32) 
     15ENDIF() 
    1616 
    1717SET(HEADERS_GROUP "Header Files") 
     
    2424IF(MSVC AND OSG_MSVC_VERSIONED_DLL) 
    2525    HANDLE_MSVC_DLL() 
    26 ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL) 
     26ENDIF() 
    2727 
    2828INSTALL( 
  • OpenSceneGraph/trunk/CMakeModules/OsgCPack.cmake

    r9528 r9998  
    1414IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") 
    1515    SET(SYSTEM_ARCH "i386") 
    16 ELSE("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") 
     16ELSE() 
    1717    SET(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR}) 
    18 ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") 
     18ENDIF() 
    1919 
    2020# set a default system name - use CMake setting (Linux|Windows|...) 
     
    2727    IF(CMAKE_CL_64) 
    2828        SET(SYSTEM_NAME "win64") 
    29     ELSE(CMAKE_CL_64) 
     29    ELSE() 
    3030        SET(SYSTEM_NAME "win32") 
    31     ENDIF(CMAKE_CL_64) 
    32 ENDIF(MSVC) 
     31    ENDIF() 
     32ENDIF() 
     33 
    3334# Guess the compiler (is this desired for other platforms than windows?) 
    3435IF(NOT DEFINED OSG_CPACK_COMPILER) 
    3536    INCLUDE(OsgDetermineCompiler) 
    36 ENDIF(NOT DEFINED OSG_CPACK_COMPILER) 
     37ENDIF() 
    3738 
    3839# expose the compiler setting to the user 
     
    4041 
    4142IF(OSG_CPACK_COMPILER) 
    42   SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}-${OSG_CPACK_COMPILER}) 
    43 ELSE(OSG_CPACK_COMPILER) 
    44   SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}) 
    45 ENDIF(OSG_CPACK_COMPILER) 
     43    SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}-${OSG_CPACK_COMPILER}) 
     44ELSE() 
     45    SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}) 
     46ENDIF() 
    4647 
    4748 
     
    5859    SET(OSG_CPACK_CONFIGURATION "$(OutDir)") 
    5960    SET(PACKAGE_TARGET_PREFIX "Package ") 
    60 ELSE(MSVC_IDE) 
     61ELSE() 
    6162    # on un*x an empty CMAKE_BUILD_TYPE means release 
    6263    IF(CMAKE_BUILD_TYPE) 
    6364        SET(OSG_CPACK_CONFIGURATION ${CMAKE_BUILD_TYPE}) 
    64     ELSE(CMAKE_BUILD_TYPE) 
     65    ELSE() 
    6566        SET(OSG_CPACK_CONFIGURATION "Release") 
    66     ENDIF(CMAKE_BUILD_TYPE) 
     67    ENDIF() 
    6768    SET(PACKAGE_TARGET_PREFIX "package_") 
    68 ENDIF(MSVC_IDE) 
     69ENDIF() 
    6970 
    7071# Get all defined components 
     
    7576  MESSAGE("When building packages please consider using cmake version 2.6.1 or above") 
    7677  SET(CPACK_COMPONENTS_ALL libopenscenegraph libopenthreads openscenegraph libopenscenegraph-dev libopenthreads-dev) 
    77 ENDIF(NOT CPACK_COMPONENTS_ALL) 
     78ENDIF() 
    7879 
    7980# Create a target that will be used to generate all packages defined below 
     
    8182ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME}) 
    8283 
     84#============================= 
     85# Macro: 
     86#    GENERATE_PACKAGING_TARGET() 
     87# 
    8388MACRO(GENERATE_PACKAGING_TARGET package_name) 
    8489    SET(CPACK_PACKAGE_NAME ${package_name}) 
     
    8792    IF(${package} MATCHES -doc) 
    8893        SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION}) 
    89     ELSE(${package} MATCHES -doc) 
     94    ELSE() 
    9095        SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION}-${OSG_CPACK_SYSTEM_SPEC_STRING}-${OSG_CPACK_CONFIGURATION}) 
    9196        IF(NOT DYNAMIC_OPENSCENEGRAPH) 
    9297            SET(OSG_PACKAGE_FILE_NAME ${OSG_PACKAGE_FILE_NAME}-static) 
    93         ENDIF(NOT DYNAMIC_OPENSCENEGRAPH) 
    94     ENDIF(${package} MATCHES -doc) 
     98        ENDIF() 
     99    ENDIF() 
    95100 
    96101    CONFIGURE_FILE("${OpenSceneGraph_SOURCE_DIR}/CMakeModules/OsgCPackConfig.cmake.in" "${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake" IMMEDIATE) 
     
    99104 
    100105    # This is naive and will probably need fixing eventually 
    101     IF(MSVC) 
     106    IF(WIN32) 
    102107        SET(MOVE_COMMAND "move") 
    103     ELSE(MSVC) 
     108    ELSE() 
    104109        SET(MOVE_COMMAND "mv") 
    105     ENDIF(MSVC) 
     110    ENDIF() 
    106111     
    107112    # Create a target that creates the current package 
     
    122127    ) 
    123128ENDMACRO(GENERATE_PACKAGING_TARGET) 
     129# 
     130#============================= 
    124131 
    125132# Create configs and targets for a package including all components 
     
    131138    SET(OSG_CPACK_COMPONENT ${package}) 
    132139    GENERATE_PACKAGING_TARGET(${package}) 
    133 ENDFOREACH(package ${CPACK_COMPONENTS_ALL}) 
     140ENDFOREACH() 
  • OpenSceneGraph/trunk/CMakeModules/OsgDetermineCompiler.cmake

    r9528 r9998  
    1 # - Figure out what compiler (and version) cmake is generating for 
    2 # Once done this will define: 
     1# - If Visual Studio is being used, this script sets the variable OSG_COMPILER 
     2# The principal reason for this is due to MSVC 8.0 SP0 vs SP1 builds. 
    33# 
    44# Variable: 
     
    66#  
    77 
    8 IF(CMAKE_COMPILER_IS_GNUCXX) 
     8# Not currently used... 
     9#IF(CMAKE_COMPILER_IS_GNUCXX) 
     10#    EXEC_PROGRAM( 
     11#        ${CMAKE_CXX_COMPILER}   
     12#        ARGS     ${CMAKE_CXX_COMPILER_ARG1} -dumpversion  
     13#        OUTPUT_VARIABLE gcc_compiler_version 
     14#    ) 
     15#    #MESSAGE("GCC Version: ${gcc_compiler_version}") 
    916 
    10     EXEC_PROGRAM( 
    11         ${CMAKE_CXX_COMPILER}   
    12         ARGS     ${CMAKE_CXX_COMPILER_ARG1} -dumpversion  
    13         OUTPUT_VARIABLE gcc_compiler_version 
    14     ) 
    15     #MESSAGE("GCC Version: ${gcc_compiler_version}") 
     17IF(MSVC60) 
     18    SET(OSG_COMPILER "vc60") 
     19ELSEIF(MSVC70) 
     20    SET(OSG_COMPILER "vc70") 
     21ELSEIF(MSVC71) 
     22    SET(OSG_COMPILER "vc71") 
     23ELSEIF(MSVC80) 
     24    SET(OSG_COMPILER "vc80") 
     25ELSEIF(MSVC90) 
     26    SET(OSG_COMPILER "vc90") 
     27ENDIF() 
    1628 
    17 ELSE(CMAKE_COMPILER_IS_GNUCXX) 
    18     IF(MSVC) 
    19         IF(MSVC60) 
    20             SET(OSG_COMPILER "vc60") 
    21         ENDIF(MSVC60) 
    22         IF(MSVC70) 
    23             SET(OSG_COMPILER "vc70") 
    24         ENDIF(MSVC70) 
    25         IF(MSVC71) 
    26             SET(OSG_COMPILER "vc71") 
    27         ENDIF(MSVC71) 
    28         IF(MSVC80) 
     29 
     30IF(MSVC80) 
     31    MESSAGE(STATUS "Checking if compiler has service pack 1 installed...") 
     32    FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" "int main() {return 0;}\n") 
     33 
     34    TRY_COMPILE(_TRY_RESULT 
     35        ${CMAKE_BINARY_DIR} 
     36        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx 
     37        CMAKE_FLAGS -D CMAKE_VERBOSE_MAKEFILE=ON 
     38        OUTPUT_VARIABLE OUTPUT 
     39        ) 
     40 
     41    IF(_TRY_RESULT) 
     42        # parse for exact compiler version 
     43        STRING(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vc_compiler_version "${OUTPUT}") 
     44        IF(vc_compiler_version) 
     45            #MESSAGE("${vc_compiler_version}") 
     46            STRING(REGEX MATCHALL "[0-9]+" CL_VERSION_LIST "${vc_compiler_version}") 
     47            LIST(GET CL_VERSION_LIST 0 CL_MAJOR_VERSION) 
     48            LIST(GET CL_VERSION_LIST 1 CL_MINOR_VERSION) 
     49            LIST(GET CL_VERSION_LIST 2 CL_PATCH_VERSION) 
     50            LIST(GET CL_VERSION_LIST 3 CL_EXTRA_VERSION) 
     51        ENDIF(vc_compiler_version) 
     52 
     53        # Standard vc80 is 14.00.50727.42, sp1 14.00.50727.762, sp2? 
     54        # Standard vc90 is 9.0.30729.1, sp1 ? 
     55        IF(CL_EXTRA_VERSION EQUAL 762) 
     56            SET(OSG_COMPILER "vc80sp1") 
     57        ELSE(CL_EXTRA_VERSION EQUAL 762) 
    2958            SET(OSG_COMPILER "vc80") 
    30         ENDIF(MSVC80) 
    31         IF(MSVC90) 
    32             SET(OSG_COMPILER "vc90") 
    33         ENDIF(MSVC90) 
     59        ENDIF(CL_EXTRA_VERSION EQUAL 762) 
    3460 
    35         IF(MSVC80) 
    36             MESSAGE(STATUS "Checking if compiler has service pack 1 installed...") 
    37             FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" "int main() {return 0;}\n") 
    38  
    39             TRY_COMPILE(_TRY_RESULT 
    40               ${CMAKE_BINARY_DIR} 
    41               ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx 
    42               CMAKE_FLAGS -D CMAKE_VERBOSE_MAKEFILE=ON 
    43               OUTPUT_VARIABLE OUTPUT 
    44             ) 
    45  
    46             IF(_TRY_RESULT) 
    47                 # parse for exact compiler version 
    48                 STRING(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vc_compiler_version "${OUTPUT}") 
    49                 IF(vc_compiler_version) 
    50                     #MESSAGE("${vc_compiler_version}") 
    51                     STRING(REGEX MATCHALL "[0-9]+" CL_VERSION_LIST "${vc_compiler_version}") 
    52                     LIST(GET CL_VERSION_LIST 0 CL_MAJOR_VERSION) 
    53                     LIST(GET CL_VERSION_LIST 1 CL_MINOR_VERSION) 
    54                     LIST(GET CL_VERSION_LIST 2 CL_PATCH_VERSION) 
    55                     LIST(GET CL_VERSION_LIST 3 CL_EXTRA_VERSION) 
    56                 ENDIF(vc_compiler_version) 
    57  
    58                 # Standard vc80 is 14.00.50727.42, sp1 14.00.50727.762, sp2? 
    59                 # Standard vc90 is 9.0.30729.1, sp1 ? 
    60                 IF(CL_EXTRA_VERSION EQUAL 762) 
    61                     SET(OSG_COMPILER "vc80sp1") 
    62                 ELSE(CL_EXTRA_VERSION EQUAL 762) 
    63                     SET(OSG_COMPILER "vc80") 
    64                 ENDIF(CL_EXTRA_VERSION EQUAL 762) 
    65  
    66                 # parse for exact visual studio version 
    67                 #IF(MSVC_IDE) 
    68                 # string(REGEX MATCH "Visual Studio Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vs_version "${OUTPUT}") 
    69                 # IF(vs_version) 
    70                     # MESSAGE("${vs_version}") 
    71                     # string(REGEX MATCHALL "[0-9]+" VS_VERSION_LIST "${vs_version}") 
    72                     # list(GET VS_VERSION_LIST 0 VS_MAJOR_VERSION) 
    73                     # list(GET VS_VERSION_LIST 1 VS_MINOR_VERSION) 
    74                     # list(GET VS_VERSION_LIST 2 VS_PATCH_VERSION) 
    75                     # list(GET VS_VERSION_LIST 3 VS_EXTRA_VERSION) 
    76                 # ENDIF(vs_version) 
    77                 #ENDIF(MSVC_IDE) 
    78             ENDIF(_TRY_RESULT) 
    79         ENDIF(MSVC80) 
    80     ENDIF(MSVC) 
    81 ENDIF(CMAKE_COMPILER_IS_GNUCXX) 
     61        # parse for exact visual studio version 
     62        #IF(MSVC_IDE) 
     63        # string(REGEX MATCH "Visual Studio Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vs_version "${OUTPUT}") 
     64        # IF(vs_version) 
     65        # MESSAGE("${vs_version}") 
     66        # string(REGEX MATCHALL "[0-9]+" VS_VERSION_LIST "${vs_version}") 
     67        # list(GET VS_VERSION_LIST 0 VS_MAJOR_VERSION) 
     68        # list(GET VS_VERSION_LIST 1 VS_MINOR_VERSION) 
     69        # list(GET VS_VERSION_LIST 2 VS_PATCH_VERSION) 
     70        # list(GET VS_VERSION_LIST 3 VS_EXTRA_VERSION) 
     71        # ENDIF(vs_version) 
     72        #ENDIF(MSVC_IDE) 
     73    ENDIF(_TRY_RESULT) 
     74ENDIF(MSVC80) 
  • OpenSceneGraph/trunk/CMakeModules/UtilityMacros.cmake

    r7025 r9998  
    22INCLUDE(ListHandle) 
    33 
    4  
    5   MACRO(FILTER_OUT FILTERS INPUTS OUTPUT) 
    6        # Mimicks Gnu Make's $(filter-out) which removes elements  
    7        # from a list that match the pattern. 
    8        # Arguments: 
    9        #  FILTERS - list of patterns that need to be removed 
    10        #  INPUTS  - list of inputs that will be worked on 
    11        #  OUTPUT  - the filtered list to be returned 
    12        #  
    13        # Example:  
    14        #  SET(MYLIST this that and the other) 
    15        #  SET(FILTS this that) 
    16        # 
    17        #  FILTER_OUT("${FILTS}" "${MYLIST}" OUT) 
    18        #  MESSAGE("OUTPUT = ${OUT}") 
    19        # 
    20        # The output -  
    21        #   OUTPUT = and;the;other 
    22        # 
    23        SET(FOUT "") 
    24        FOREACH(INP ${INPUTS}) 
    25            SET(FILTERED 0) 
    26            FOREACH(FILT ${FILTERS}) 
    27                IF(${FILTERED} EQUAL 0) 
    28                    IF("${FILT}" STREQUAL "${INP}") 
    29                        SET(FILTERED 1) 
    30                    ENDIF("${FILT}" STREQUAL "${INP}") 
    31                ENDIF(${FILTERED} EQUAL 0) 
    32            ENDFOREACH(FILT ${FILTERS}) 
    33            IF(${FILTERED} EQUAL 0) 
    34                SET(FOUT ${FOUT} ${INP}) 
    35            ENDIF(${FILTERED} EQUAL 0) 
    36        ENDFOREACH(INP ${INPUTS}) 
    37        SET(${OUTPUT} ${FOUT}) 
    38    ENDMACRO(FILTER_OUT FILTERS INPUTS OUTPUT) 
    39  
    40  
    41    MACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT) 
    42             FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" ) 
    43       #FOREACH(F ${TMP}) 
    44             #    MESSAGE(STATUS "header-->${F}<--") 
    45       #ENDFOREACH(F ${TMP}) 
    46             FILTER_OUT("${DIR}/CVS" "${TMP}" TMP) 
    47             FILTER_OUT("${DIR}/cvs" "${TMP}" ${OUTPUT}) 
    48             FILTER_OUT("${DIR}/.svn" "${TMP}" ${OUTPUT}) 
    49    ENDMACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT) 
     4#--------------------------------------------------- 
     5# Macro: FILTER_OUT FILTERS INPUTS OUTPUT 
     6# 
     7# Mimicks Gnu Make's $(filter-out) which removes elements  
     8# from a list that match the pattern. 
     9# Arguments: 
     10#  FILTERS - list of patterns that need to be removed 
     11#  INPUTS  - list of inputs that will be worked on 
     12#  OUTPUT  - the filtered list to be returned 
     13#  
     14# Example:  
     15#  SET(MYLIST this that and the other) 
     16#  SET(FILTS this that) 
     17# 
     18#  FILTER_OUT("${FILTS}" "${MYLIST}" OUT) 
     19#  MESSAGE("OUTPUT = ${OUT}") 
     20# 
     21# The output -  
     22#   OUTPUT = and;the;other 
     23# 
     24#--------------------------------------------------- 
     25MACRO(FILTER_OUT FILTERS INPUTS OUTPUT) 
     26    SET(FOUT "") 
     27    FOREACH(INP ${INPUTS}) 
     28        SET(FILTERED 0) 
     29 
     30        FOREACH(FILT ${FILTERS}) 
     31            IF(${FILTERED} EQUAL 0) 
     32                IF("${FILT}" STREQUAL "${INP}") 
     33                    SET(FILTERED 1) 
     34                ENDIF() 
     35            ENDIF() 
     36        ENDFOREACH() 
     37 
     38        IF(${FILTERED} EQUAL 0) 
     39            SET(FOUT ${FOUT} ${INP}) 
     40        ENDIF() 
     41 
     42    ENDFOREACH(INP ${INPUTS}) 
     43    SET(${OUTPUT} ${FOUT}) 
     44ENDMACRO() 
     45 
     46#--------------------------------------------------- 
     47# Macro: GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT 
     48# 
     49#--------------------------------------------------- 
     50MACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT) 
     51    FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" ) 
     52    #FOREACH(F ${TMP}) 
     53    #    MESSAGE(STATUS "header-->${F}<--") 
     54    #ENDFOREACH(F ${TMP}) 
     55    FILTER_OUT("${DIR}/CVS" "${TMP}" TMP) 
     56    FILTER_OUT("${DIR}/cvs" "${TMP}" ${OUTPUT}) 
     57    FILTER_OUT("${DIR}/.svn" "${TMP}" ${OUTPUT}) 
     58ENDMACRO() 
     59 
     60#--------------------------------------------------- 
     61# Macro: ADD_DIRS_TO_ENV_VAR _VARNAME 
     62# 
     63#--------------------------------------------------- 
    5064    
    5165MACRO(ADD_DIRS_TO_ENV_VAR _VARNAME ) 
    52  FOREACH(_ADD_PATH ${ARGN})  
    53     FILE(TO_NATIVE_PATH ${_ADD_PATH} _ADD_NATIVE) 
    54     #SET(_CURR_ENV_PATH $ENV{PATH}) 
    55     #LIST(SET _CURR_ENV_PATH ${_ADD_PATH}) 
    56     #SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE} 
    57     IF(WIN32) 
    58         SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}") 
    59     ELSE(WIN32) 
    60         SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}") 
    61     ENDIF(WIN32) 
    62     #MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---") 
    63  ENDFOREACH(_ADD_PATH) 
    64 ENDMACRO(ADD_DIRS_TO_ENV_VAR _VARNAME ) 
    65  
    66 #--------------------------------------------------- 
    67 # MACRO CORRECT_PATH VAR PATH  
    68 # corrects slashes in PATH to be cmake conformous ( / )  
     66    FOREACH(_ADD_PATH ${ARGN})  
     67        FILE(TO_NATIVE_PATH ${_ADD_PATH} _ADD_NATIVE) 
     68        #SET(_CURR_ENV_PATH $ENV{PATH}) 
     69        #LIST(SET _CURR_ENV_PATH ${_ADD_PATH}) 
     70        #SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE} 
     71        IF(WIN32) 
     72            SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}") 
     73        ELSE() 
     74            SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}") 
     75        ENDIF() 
     76        #MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---") 
     77    ENDFOREACH() 
     78ENDMACRO() 
     79 
     80#--------------------------------------------------- 
     81# Macro: CORRECT_PATH VAR PATH  
     82#  
     83# Corrects slashes in PATH to be cmake conformous ( / )  
    6984# and puts result in VAR  
    7085#--------------------------------------------------- 
     
    7287MACRO(CORRECT_PATH VAR PATH) 
    7388    SET(${VAR} ${PATH}) 
    74 IF(WIN32)     
    75     STRING(REGEX REPLACE "/" "\\\\" ${VAR} "${PATH}") 
    76 ENDIF(WIN32)     
    77 ENDMACRO(CORRECT_PATH) 
     89    IF(WIN32)     
     90        STRING(REGEX REPLACE "/" "\\\\" ${VAR} "${PATH}") 
     91    ENDIF()     
     92ENDMACRO() 
     93 
     94#--------------------------------------------------- 
     95# Macro: TARGET_LOCATIONS_SET_FILE FILE 
     96# TODO: Ok, this seems a bit ridiculuous. 
     97#--------------------------------------------------- 
    7898 
    7999MACRO(TARGET_LOCATIONS_SET_FILE FILE) 
    80  SET(ACCUM_FILE_TARGETS ${FILE}) 
    81  FILE(WRITE ${ACCUM_FILE_TARGETS} "") 
    82 ENDMACRO(TARGET_LOCATIONS_SET_FILE FILE) 
     100    SET(ACCUM_FILE_TARGETS ${FILE}) 
     101    FILE(WRITE ${ACCUM_FILE_TARGETS} "") 
     102ENDMACRO() 
     103 
     104#--------------------------------------------------- 
     105# Macro: TARGET_LOCATIONS_ACCUM TARGET_NAME 
     106#  
     107#--------------------------------------------------- 
    83108 
    84109MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME) 
    85  IF(ACCUM_FILE_TARGETS) 
    86   IF(EXISTS ${ACCUM_FILE_TARGETS}) 
    87     GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION) 
    88     FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};") 
    89     #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll") 
    90     #MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--") 
    91     #SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION}) 
    92   ENDIF(EXISTS ${ACCUM_FILE_TARGETS}) 
    93  ENDIF(ACCUM_FILE_TARGETS) 
    94 ENDMACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME) 
     110    IF(ACCUM_FILE_TARGETS) 
     111        IF(EXISTS ${ACCUM_FILE_TARGETS}) 
     112            GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION) 
     113            FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};") 
     114            #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll") 
     115            #MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--") 
     116            #SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION}) 
     117        ENDIF() 
     118    ENDIF() 
     119ENDMACRO() 
     120 
     121#--------------------------------------------------- 
     122# Macro: TARGET_LOCATIONS_GET_LIST _VAR 
     123#  
     124#--------------------------------------------------- 
    95125 
    96126MACRO(TARGET_LOCATIONS_GET_LIST _VAR) 
    97  IF(ACCUM_FILE_TARGETS) 
    98   IF(EXISTS ${ACCUM_FILE_TARGETS}) 
    99       FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR})     
    100   ENDIF(EXISTS ${ACCUM_FILE_TARGETS}) 
    101  ENDIF(ACCUM_FILE_TARGETS) 
    102 ENDMACRO(TARGET_LOCATIONS_GET_LIST _VAR) 
    103  
     127    IF(ACCUM_FILE_TARGETS) 
     128        IF(EXISTS ${ACCUM_FILE_TARGETS}) 
     129            FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR})     
     130        ENDIF(EXISTS ${ACCUM_FILE_TARGETS}) 
     131    ENDIF() 
     132ENDMACRO() 
     133 
     134#--------------------------------------------------- 
     135# Macro: FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST 
     136#  
     137#--------------------------------------------------- 
    104138 
    105139MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST) 
    106  
    107 MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--") 
    108  
    109 SET(MY_PATH_INCLUDE ) 
    110 SET(MY_PATH_LIB ) 
    111 SET(MY_PATH_BIN ) 
    112  
    113 FOREACH( MYPATH ${SEARCHPATHLIST} ) 
    114     SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include) 
    115     SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib) 
    116     SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin) 
    117 ENDFOREACH( MYPATH ${SEARCHPATHLIST} ) 
    118  
    119 SET(MYLIBRARY "${LIBRARY}") 
    120 SEPARATE_ARGUMENTS(MYLIBRARY) 
    121  
    122 #MESSAGE( " include paths: -->${MY_PATH_INCLUDE}<--") 
    123  
    124 #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") 
    125      
    126 FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE} 
    127   ${MY_PATH_INCLUDE} 
    128 ) 
    129 MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR") 
    130 #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") 
    131  
    132 FIND_LIBRARY("${DEPNAME}_LIBRARY"  
    133     NAMES ${MYLIBRARY} 
    134   PATHS ${MY_PATH_LIB} 
    135 ) 
    136 IF(${DEPNAME}_LIBRARY) 
    137     GET_FILENAME_COMPONENT(MYLIBNAME ${${DEPNAME}_LIBRARY} NAME_WE) 
    138     GET_FILENAME_COMPONENT(MYBINPATH ${${DEPNAME}_LIBRARY} PATH) 
    139     GET_FILENAME_COMPONENT(MYBINPATH ${MYBINPATH} PATH) 
    140     SET(MYBINPATH "${MYBINPATH}/bin") 
    141     IF(EXISTS ${MYBINPATH}) 
    142         SET(MYFOUND 0) 
    143         FOREACH(MYPATH ${MY_ACCUM_BINARY_DEP}) 
    144             IF(MYPATH MATCHES ${MYBINPATH}) 
    145                 SET(MYFOUND 1) 
    146                 #MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--") 
    147             ENDIF(MYPATH MATCHES ${MYBINPATH}) 
    148         ENDFOREACH(MYPATH ) 
    149         IF(MYFOUND EQUAL 0) 
    150             SET(MY_ACCUM_BINARY_DEP ${MY_ACCUM_BINARY_DEP} ${MYBINPATH}) 
    151         ENDIF(MYFOUND EQUAL 0) 
    152     ENDIF(EXISTS ${MYBINPATH}) 
    153     #MESSAGE("${DEPNAME}_BINDEP searching -->${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}<--in-->${MY_PATH_BIN}<--") 
    154 #    FIND_FILE("${DEPNAME}_BINDEP"  
    155 #        ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX} 
    156 #      PATHS ${MY_PATH_BIN} 
    157 #    ) 
    158 #    FIND_LIBRARY("${DEPNAME}_BINDEP"  
    159 #        NAMES ${MYLIBRARY} 
    160 #      PATHS ${MY_PATH_BIN} 
    161 #    ) 
    162 ENDIF(${DEPNAME}_LIBRARY) 
    163 MARK_AS_ADVANCED("${DEPNAME}_LIBRARY") 
    164 #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--") 
    165 IF(${DEPNAME}_INCLUDE_DIR) 
    166   IF(${DEPNAME}_LIBRARY) 
    167     SET( ${DEPNAME}_FOUND "YES" ) 
    168     SET( ${DEPNAME}_LIBRARIES ${${DEPNAME}_LIBRARY} ) 
    169   ENDIF(${DEPNAME}_LIBRARY) 
    170 ENDIF(${DEPNAME}_INCLUDE_DIR) 
    171 ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST) 
     140    MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--") 
     141 
     142    SET(MY_PATH_INCLUDE ) 
     143    SET(MY_PATH_LIB ) 
     144    SET(MY_PATH_BIN ) 
     145 
     146    FOREACH( MYPATH ${SEARCHPATHLIST} ) 
     147        SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include) 
     148        SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib) 
     149        SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin) 
     150    ENDFOREACH() 
     151 
     152    SET(MYLIBRARY "${LIBRARY}") 
     153    SEPARATE_ARGUMENTS(MYLIBRARY) 
     154 
     155    #MESSAGE( " include paths: -->${MY_PATH_INCLUDE}<--") 
     156 
     157    #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") 
     158 
     159    FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE} 
     160        ${MY_PATH_INCLUDE} 
     161        ) 
     162    MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR") 
     163    #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") 
     164 
     165    FIND_LIBRARY("${DEPNAME}_LIBRARY"  
     166        NAMES ${MYLIBRARY} 
     167        PATHS ${MY_PATH_LIB} 
     168        ) 
     169    IF(${DEPNAME}_LIBRARY) 
     170        GET_FILENAME_COMPONENT(MYLIBNAME ${${DEPNAME}_LIBRARY} NAME_WE) 
     171        GET_FILENAME_COMPONENT(MYBINPATH ${${DEPNAME}_LIBRARY} PATH) 
     172        GET_FILENAME_COMPONENT(MYBINPATH ${MYBINPATH} PATH) 
     173        SET(MYBINPATH "${MYBINPATH}/bin") 
     174        IF(EXISTS ${MYBINPATH}) 
     175            SET(MYFOUND 0) 
     176            FOREACH(MYPATH ${MY_ACCUM_BINARY_DEP}) 
     177                IF(MYPATH MATCHES ${MYBINPATH}) 
     178                    SET(MYFOUND 1) 
     179                    #MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--") 
     180                ENDIF() 
     181            ENDFOREACH() 
     182            IF(MYFOUND EQUAL 0) 
     183                SET(MY_ACCUM_BINARY_DEP ${MY_ACCUM_BINARY_DEP} ${MYBINPATH}) 
     184            ENDIF() 
     185        ENDIF() 
     186        #MESSAGE("${DEPNAME}_BINDEP searching -->${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}<--in-->${MY_PATH_BIN}<--") 
     187        #    FIND_FILE("${DEPNAME}_BINDEP"  
     188        #        ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX} 
     189        #      PATHS ${MY_PATH_BIN} 
     190        #    ) 
     191        #    FIND_LIBRARY("${DEPNAME}_BINDEP"  
     192        #        NAMES ${MYLIBRARY} 
     193        #      PATHS ${MY_PATH_BIN} 
     194        #    ) 
     195    ENDIF() 
     196 
     197    MARK_AS_ADVANCED("${DEPNAME}_LIBRARY") 
     198    #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--") 
     199    IF(${DEPNAME}_INCLUDE_DIR) 
     200        IF(${DEPNAME}_LIBRARY) 
     201            SET( ${DEPNAME}_FOUND "YES" ) 
     202            SET( ${DEPNAME}_LIBRARIES ${${DEPNAME}_LIBRARY} ) 
     203        ENDIF() 
     204    ENDIF() 
     205ENDMACRO() 
     206 
     207#--------------------------------------------------- 
     208# Macro: MACRO_MESSAGE MYTEXT 
     209# 
     210#--------------------------------------------------- 
    172211 
    173212#SET(MACRO_MESSAGE_DEBUG TRUE) 
     
    175214    IF(MACRO_MESSAGE_DEBUG) 
    176215        MESSAGE("in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message  ${MYTEXT}") 
    177     ELSE(MACRO_MESSAGE_DEBUG) 
     216    ELSE() 
    178217        MESSAGE(STATUS "in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message  ${MYTEXT}") 
    179     ENDIF(MACRO_MESSAGE_DEBUG) 
    180 ENDMACRO(MACRO_MESSAGE MYTEXT) 
     218    ENDIF() 
     219ENDMACRO() 
     220 
  • OpenSceneGraph/trunk/CMakeModules/cmake_uninstall.cmake.in

    r7025 r9998  
    11IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") 
    2   MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") 
    3 ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") 
     2    MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") 
     3ENDIF() 
    44 
    55FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) 
    66STRING(REGEX REPLACE "\n" ";" files "${files}") 
     7 
    78FOREACH(file ${files}) 
    8   MESSAGE(STATUS "Uninstalling \"${file}\"") 
    9   IF(EXISTS "${file}") 
    10     EXEC_PROGRAM( 
    11       "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" 
    12       OUTPUT_VARIABLE rm_out 
    13       RETURN_VALUE rm_retval 
    14       ) 
    15     IF("${rm_retval}" STREQUAL 0) 
    16     ELSE("${rm_retval}" STREQUAL 0) 
    17       MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") 
    18     ENDIF("${rm_retval}" STREQUAL 0) 
    19   ELSE(EXISTS "${file}") 
    20     MESSAGE(STATUS "File \"${file}\" does not exist.") 
    21   ENDIF(EXISTS "${file}") 
    22 ENDFOREACH(file) 
     9    MESSAGE(STATUS "Uninstalling \"${file}\"") 
     10    IF(EXISTS "${file}") 
     11        EXEC_PROGRAM( 
     12            "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" 
     13            OUTPUT_VARIABLE rm_out 
     14            RETURN_VALUE rm_retval 
     15            ) 
     16        IF(NOT "${rm_retval}" STREQUAL 0) 
     17            MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") 
     18        ENDIF() 
     19    ELSE() 
     20        MESSAGE(STATUS "File \"${file}\" does not exist.") 
     21    ENDIF() 
     22ENDFOREACH() 
  • OpenSceneGraph/trunk/src/osgPlugins/3dc/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriter3DC.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/3ds/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC 
    5 ReaderWriter3DS.cpp 
    6 atmosphere.cpp 
    7 background.cpp 
    8 camera.cpp 
    9 chunk.cpp 
    10 ease.cpp 
    11 file.cpp 
    12 lib3ds_float.cpp 
    13 light.cpp 
    14 material.cpp 
    15 matrix.cpp 
    16 mesh.cpp 
    17 node.cpp 
    18 quat.cpp 
    19 readwrite.cpp 
    20 shadow.cpp 
    21 tcb.cpp 
    22 tracks.cpp 
    23 vector.cpp 
    24 viewport.cpp 
     2    ReaderWriter3DS.cpp 
     3    atmosphere.cpp 
     4    background.cpp 
     5    camera.cpp 
     6    chunk.cpp 
     7    ease.cpp 
     8    file.cpp 
     9    lib3ds_float.cpp 
     10    light.cpp 
     11    material.cpp 
     12    matrix.cpp 
     13    mesh.cpp 
     14    node.cpp 
     15    quat.cpp 
     16    readwrite.cpp 
     17    shadow.cpp 
     18    tcb.cpp 
     19    tracks.cpp 
     20    vector.cpp 
     21    viewport.cpp 
    2522) 
    2623SET(TARGET_H 
    27 atmosphere.h 
    28 background.h 
    29 camera.h 
    30 chunk.h 
    31 chunktable.h 
    32 config.h 
    33 ease.h 
    34 file.h 
    35 lib3ds_float.h 
    36 light.h 
    37 material.h 
    38 matrix.h 
    39 mesh.h 
    40 node.h 
    41 quat.h 
    42 readwrite.h 
    43 shadow.h 
    44 tcb.h 
    45 tracks.h 
    46 types.h 
    47 vector.h 
    48 viewport.h 
     24    atmosphere.h 
     25    background.h 
     26    camera.h 
     27    chunk.h 
     28    chunktable.h 
     29    config.h 
     30    ease.h 
     31    file.h 
     32    lib3ds_float.h 
     33    light.h 
     34    material.h 
     35    matrix.h 
     36    mesh.h 
     37    node.h 
     38    quat.h 
     39    readwrite.h 
     40    shadow.h 
     41    tcb.h 
     42    tracks.h 
     43    types.h 
     44    vector.h 
     45    viewport.h 
    4946) 
    5047#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/CMakeLists.txt

    r8003 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC 
    52    AncillaryRecords.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/ac/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC Exception.cpp Geode.cpp ac3d.cpp ) 
    52SET(TARGET_H Exception.h Geode.h ) 
  • OpenSceneGraph/trunk/src/osgPlugins/bmp/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterBMP.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/bvh/CMakeLists.txt

    r9304 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterBVH.cpp ) 
    52 
  • OpenSceneGraph/trunk/src/osgPlugins/curl/CMakeLists.txt

    r9282 r9998  
    99        ADD_DEFINITIONS(-DCURL_STATICLIB) 
    1010        SET(TARGET_EXTERNAL_LIBRARIES ws2_32 winmm wldap32) 
    11     ENDIF(CURL_IS_STATIC) 
    12 ENDIF(WIN32) 
     11    ENDIF() 
     12ENDIF() 
    1313 
    1414IF(ZLIB_FOUND) 
    1515    ADD_DEFINITIONS(-DUSE_ZLIB) 
    1616    INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) 
    17 ELSE(ZLIB_FOUND) 
     17ELSE() 
    1818    INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIRS} ) 
    19 ENDIF(ZLIB_FOUND) 
     19ENDIF() 
    2020 
    2121 
     
    3030IF(ZLIB_FOUND) 
    3131    SET(TARGET_LIBRARIES_VARS CURL_LIBRARY ZLIB_LIBRARY) 
    32 ELSE(ZLIB_FOUND) 
     32ELSE() 
    3333    SET(TARGET_LIBRARIES_VARS CURL_LIBRARY ) 
    34 ENDIF(ZLIB_FOUND) 
     34ENDIF() 
    3535 
    3636 
  • OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt

    r9953 r9998  
    11IF (WIN32) 
    22    INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4 ${COLLADA_BOOST_INCLUDE_DIR} ) 
    3 ELSE (WIN32) 
     3ELSE () 
    44    INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4) 
    5 ENDIF (WIN32) 
     5ENDIF () 
    66 
    77SET(TARGET_SRC 
     
    2828 
    2929 
    30 IF   (COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY) 
     30IF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY) 
     31    OPTION(COLLADA_USE_STATIC "Set to ON to build OpenSceneGraph with static Collada support." OFF) 
     32ELSEIF(COLLADA_STATIC_LIBRARY) 
     33    SET(COLLADA_USE_STATIC "YES") 
     34ELSE() 
     35    SET(COLLADA_USE_STATIC "NO") 
     36ENDIF() 
    3137 
    32     OPTION(COLLADA_USE_STATIC "Set to ON to build OpenSceneGraph with static Collada support." OFF) 
    33  
    34 ELSE(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY) 
    35  
    36     IF   (COLLADA_STATIC_LIBRARY) 
    37         SET(COLLADA_USE_STATIC "YES") 
    38     ELSE(COLLADA_STATIC_LIBRARY) 
    39         SET(COLLADA_USE_STATIC "NO") 
    40     ENDIF(COLLADA_STATIC_LIBRARY) 
    41  
    42 ENDIF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY) 
    43  
    44 IF   (COLLADA_USE_STATIC) 
     38IF(COLLADA_USE_STATIC) 
    4539    IF(WIN32) 
    4640        ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB) 
    47         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) 
    48     ELSE(WIN32) 
    49         SET(TARGET_LIBRARIES_VARS COLLADA_STATIC_LIBRARY COLLADA_LIBXML_LIBRARY COLLADA_PCRECPP_LIBRARY  COLLADA_BOOST_FILESYSTEM_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)     
    50     ENDIF(WIN32) 
    51 ELSE (COLLADA_USE_STATIC) 
     41        SET(TARGET_LIBRARIES_VARS 
     42            COLLADA_STATIC_LIBRARY 
     43            COLLADA_LIBXML_LIBRARY 
     44            COLLADA_ZLIB_LIBRARY 
     45            COLLADA_PCRECPP_LIBRARY 
     46            COLLADA_PCRE_LIBRARY 
     47            COLLADA_MINIZIP_LIBRARY 
     48            COLLADA_BOOST_FILESYSTEM_LIBRARY 
     49            COLLADA_BOOST_SYSTEM_LIBRARY) 
     50    ELSE() 
     51        SET(TARGET_LIBRARIES_VARS 
     52            COLLADA_STATIC_LIBRARY 
     53            COLLADA_LIBXML_LIBRARY 
     54            COLLADA_PCRECPP_LIBRARY 
     55            COLLADA_BOOST_FILESYSTEM_LIBRARY 
     56            COLLADA_BOOST_SYSTEM_LIBRARY)     
     57    ENDIF() 
     58ELSE() 
    5259    IF(WIN32) 
    5360        ADD_DEFINITIONS(-DDOM_DYNAMIC -DBOOST_ALL_NO_LIB) 
    54         SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY) 
    55     ELSE(WIN32) 
    56         SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY) 
    57     ENDIF(WIN32)  
    58 ENDIF(COLLADA_USE_STATIC) 
     61        SET(TARGET_LIBRARIES_VARS 
     62            COLLADA_DYNAMIC_LIBRARY 
     63            COLLADA_BOOST_SYSTEM_LIBRARY) 
     64    ELSE() 
     65        SET(TARGET_LIBRARIES_VARS 
     66            COLLADA_DYNAMIC_LIBRARY) 
     67    ENDIF()  
     68ENDIF() 
    5969  
    6070SET(TARGET_ADDED_LIBRARIES osgSim )  
  • OpenSceneGraph/trunk/src/osgPlugins/dds/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterDDS.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/dicom/CMakeLists.txt

    r9489 r9998  
    1 IF  (DCMTK_FOUND) 
    2  
     1IF(DCMTK_FOUND) 
    32    # note, we have to include a '/' in front of the directory string to prevent a CMake bug from ignoring the directory 
    43    INCLUDE_DIRECTORIES(/${DCMTK_ROOT_INCLUDE_DIR}) 
     
    109    ADD_DEFINITIONS(-DUSE_DCMTK) 
    1110 
    12 ELSE(DCMTK_FOUND) 
    13  
    14     IF (ITK_FOUND) 
     11ELSEIF(ITK_FOUND) 
    1512 
    1613    INCLUDE(${ITK_USE_FILE}) 
     
    2825    ADD_DEFINITIONS(-DUSE_ITK) 
    2926 
    30     ENDIF(ITK_FOUND) 
    31  
    32 ENDIF(DCMTK_FOUND) 
     27ENDIF() 
    3328 
    3429SET(TARGET_ADDED_LIBRARIES osgVolume ) 
  • OpenSceneGraph/trunk/src/osgPlugins/dot/CMakeLists.txt

    r9030 r9998  
    1 #this file is automatically generated by rschmidt 
    2  
    31SET(TARGET_SRC SimpleDotVisitor.cpp BaseDotVisitor.cpp ReaderWriterDOT.cpp) 
    42 
  • OpenSceneGraph/trunk/src/osgPlugins/dw/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterDW.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt

    r9948 r9998  
    1515 
    1616 
    17 IF (FFMPEG_LIBSWSCALE_FOUND) 
     17IF(FFMPEG_LIBSWSCALE_FOUND) 
    1818 
    1919    INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) 
  • OpenSceneGraph/trunk/src/osgPlugins/freetype/CMakeLists.txt

    r9937 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41IF(WIN32) 
    52    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT") 
    6 ENDIF(WIN32) 
     3ENDIF() 
    74 
    85INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} ) 
     
    107IF(APPLE) 
    118  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") 
    12 ENDIF(APPLE) 
     9ENDIF() 
    1310 
    14 SET(TARGET_SRC FreeTypeFont.cpp FreeTypeFont3D.cpp FreeTypeLibrary.cpp ReaderWriterFreeType.cpp ) 
    15 SET(TARGET_H FreeTypeFont.h FreeTypeFont3D.h FreeTypeLibrary.h ) 
     11SET(TARGET_SRC 
     12    FreeTypeFont.cpp 
     13    FreeTypeFont3D.cpp 
     14    FreeTypeLibrary.cpp 
     15    ReaderWriterFreeType.cpp ) 
     16SET(TARGET_H 
     17    FreeTypeFont.h 
     18    FreeTypeFont3D.h 
     19    FreeTypeLibrary.h ) 
    1620SET(TARGET_ADDED_LIBRARIES osgText ) 
    1721SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY ) 
  • OpenSceneGraph/trunk/src/osgPlugins/gecko/CMakeLists.txt

    r9668 r9998  
    4848) 
    4949 
    50 IF  (WIN32 OR APPLE) 
    51  
     50IF(WIN32 OR APPLE) 
    5251    INCLUDE_DIRECTORIES(${ALL_REQUIRED_XUL_INCLUDE_DIRS} ) 
    5352    SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES}) 
    54  
    55 ELSE(WIN32 OR APPLE)  
    56  
     53ELSE()  
    5754    INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${ALL_REQUIRED_XUL_INCLUDE_DIRS} ) 
    5855    SET(TARGET_EXTERNAL_LIBRARIES ${GTK_LIBRARIES} ${XUL_LIBRARIES}) 
    59  
    60 ENDIF(WIN32 OR APPLE) 
     56ENDIF() 
    6157 
    6258 
  • OpenSceneGraph/trunk/src/osgPlugins/geo/CMakeLists.txt

    r7323 r9998  
    1 #this file is automatically generated  
    2  
    3  
    4 SET(TARGET_SRC ClipRegion.cpp ReaderWriterGEO.cpp geoActions.cpp ) 
     1SET(TARGET_SRC 
     2    ClipRegion.cpp 
     3    ReaderWriterGEO.cpp 
     4    geoActions.cpp ) 
    55SET(TARGET_H 
    6 ClipRegion.h 
    7 geoCore.h 
    8 geoFormat.h 
    9 geoTypes.h 
    10 geoUnits.h 
    11 geoVersion.h 
    12 osgGeoAction.h 
    13 osgGeoAnimation.h 
    14 osgGeoNodes.h 
    15 osgGeoStructs.h 
     6    ClipRegion.h 
     7    geoCore.h 
     8    geoFormat.h 
     9    geoTypes.h 
     10    geoUnits.h 
     11    geoVersion.h 
     12    osgGeoAction.h 
     13    osgGeoAnimation.h 
     14    osgGeoNodes.h 
     15    osgGeoStructs.h 
    1616) 
    1717SET(TARGET_ADDED_LIBRARIES osgSim osgText) 
  • OpenSceneGraph/trunk/src/osgPlugins/gif/CMakeLists.txt

    r7364 r9998  
    1 #this file is automatically generated  
    2  
    3  
    4     INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} ) 
    5  
     1INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} ) 
    62 
    73SET(TARGET_SRC ReaderWriterGIF.cpp ) 
     
    128IF(MSVC) 
    139    SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT") 
    14 ENDIF(MSVC) 
    15  
     10ENDIF() 
  • OpenSceneGraph/trunk/src/osgPlugins/glsl/CMakeLists.txt

    r7908 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterGLSL.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/gz/CMakeLists.txt

    r9033 r9998  
    1 #this file is automatically generated  
    21INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} ) 
    32 
  • OpenSceneGraph/trunk/src/osgPlugins/hdr/CMakeLists.txt

    r7514 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC 
    52    ReaderWriterHDR.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/ive/CMakeLists.txt

    r9961 r9998  
    22    ADD_DEFINITIONS(-DUSE_ZLIB) 
    33    INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR}) 
    4 ENDIF(ZLIB_FOUND) 
     4ENDIF() 
    55 
    66 
     
    243243IF(ZLIB_FOUND) 
    244244    SET(TARGET_LIBRARIES_VARS ZLIB_LIBRARY) 
    245 ENDIF(ZLIB_FOUND) 
     245ENDIF() 
    246246 
    247247#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/jp2/CMakeLists.txt

    r7025 r9998  
    77IF(WIN32) 
    88   ADD_DEFINITIONS(-DJAS_WIN_MSVC_BUILD) 
    9 ENDIF(WIN32) 
     9ENDIF() 
    1010 
    1111 
  • OpenSceneGraph/trunk/src/osgPlugins/jpeg/CMakeLists.txt

    r7364 r9998  
    1 #this file is automatically generated  
    2  
    3  
    4     INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} ) 
    5  
     1INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} ) 
    62 
    73SET(TARGET_SRC ReaderWriterJPEG.cpp ) 
  • OpenSceneGraph/trunk/src/osgPlugins/logo/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterLOGO.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/lws/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterLWS.cpp SceneLoader.cpp ) 
    52SET(TARGET_H SceneLoader.h ) 
  • OpenSceneGraph/trunk/src/osgPlugins/md2/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterMD2.cpp ) 
    52SET(TARGET_H anorms.h ) 
  • OpenSceneGraph/trunk/src/osgPlugins/net/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterNET.cpp sockinet.cpp sockstream.cpp ) 
    52SET(TARGET_H sockinet.h sockstream.h ) 
  • OpenSceneGraph/trunk/src/osgPlugins/obj/CMakeLists.txt

    r7485 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC 
    52    OBJWriterNodeVisitor.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/osg/CMakeLists.txt

    r9616 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC 
    52    AlphaFunc.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/osgFX/CMakeLists.txt

    r7577 r9998  
    1 #this file is automatically generated  
     1SET(TARGET_SRC 
     2    IO_AnisotropicLighting.cpp 
     3    IO_BumpMapping.cpp 
     4    IO_Cartoon.cpp 
     5    IO_Effect.cpp 
     6    IO_MultiTextureControl.cpp 
     7    IO_Scribe.cpp 
     8    IO_SpecularHighlights.cpp 
     9) 
    210 
    3  
    4 SET(TARGET_SRC 
    5 IO_AnisotropicLighting.cpp 
    6 IO_BumpMapping.cpp 
    7 IO_Cartoon.cpp 
    8 IO_Effect.cpp 
    9 IO_MultiTextureControl.cpp 
    10 IO_Scribe.cpp 
    11 IO_SpecularHighlights.cpp 
    12 ) 
    1311SET(TARGET_ADDED_LIBRARIES osgFX ) 
    1412#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/osgParticle/CMakeLists.txt

    r7619 r9998  
    1 #this file is automatically generated  
     1SET(TARGET_SRC 
     2    IO_AccelOperator.cpp 
     3    IO_AngularAccelOperator.cpp 
     4    IO_BoxPlacer.cpp 
     5    IO_CenteredPlacer.cpp 
     6    IO_ConnectedParticleSystem.cpp 
     7    IO_ConstantRateCounter.cpp 
     8    IO_Emitter.cpp 
     9    IO_ExplosionDebrisEffect.cpp 
     10    IO_ExplosionEffect.cpp 
     11    IO_FireEffect.cpp 
     12    IO_FluidFrictionOperator.cpp 
     13    IO_FluidProgram.cpp 
     14    IO_ForceOperator.cpp 
     15    IO_LinearInterpolator.cpp 
     16    IO_ModularEmitter.cpp 
     17    IO_ModularProgram.cpp 
     18    IO_MultiSegmentPlacer.cpp 
     19    IO_Particle.cpp 
     20    IO_ParticleEffect.cpp 
     21    IO_ParticleProcessor.cpp 
     22    IO_ParticleSystem.cpp 
     23    IO_ParticleSystemUpdater.cpp 
     24    IO_PointPlacer.cpp 
     25    IO_Program.cpp 
     26    IO_RadialShooter.cpp 
     27    IO_RandomRateCounter.cpp 
     28    IO_SectorPlacer.cpp 
     29    IO_SegmentPlacer.cpp 
     30    IO_SmokeEffect.cpp 
     31    IO_SmokeTrailEffect.cpp 
     32    IO_VariableRateCounter.cpp 
     33) 
    234 
    3  
    4 SET(TARGET_SRC 
    5 IO_AccelOperator.cpp 
    6 IO_AngularAccelOperator.cpp 
    7 IO_BoxPlacer.cpp 
    8 IO_CenteredPlacer.cpp 
    9 IO_ConnectedParticleSystem.cpp 
    10 IO_ConstantRateCounter.cpp 
    11 IO_Emitter.cpp 
    12 IO_ExplosionDebrisEffect.cpp 
    13 IO_ExplosionEffect.cpp 
    14 IO_FireEffect.cpp 
    15 IO_FluidFrictionOperator.cpp 
    16 IO_FluidProgram.cpp 
    17 IO_ForceOperator.cpp 
    18 IO_LinearInterpolator.cpp 
    19 IO_ModularEmitter.cpp 
    20 IO_ModularProgram.cpp 
    21 IO_MultiSegmentPlacer.cpp 
    22 IO_Particle.cpp 
    23 IO_ParticleEffect.cpp 
    24 IO_ParticleProcessor.cpp 
    25 IO_ParticleSystem.cpp 
    26 IO_ParticleSystemUpdater.cpp 
    27 IO_PointPlacer.cpp 
    28 IO_Program.cpp 
    29 IO_RadialShooter.cpp 
    30 IO_RandomRateCounter.cpp 
    31 IO_SectorPlacer.cpp 
    32 IO_SegmentPlacer.cpp 
    33 IO_SmokeEffect.cpp 
    34 IO_SmokeTrailEffect.cpp 
    35 IO_VariableRateCounter.cpp 
    36 ) 
    3735SET(TARGET_ADDED_LIBRARIES osgParticle ) 
    3836#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/osgTerrain/CMakeLists.txt

    r9934 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC  
    52    Locator.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/osgText/CMakeLists.txt

    r7645 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC IO_TextBase.cpp IO_Text.cpp IO_Text3D.cpp ) 
    52SET(TARGET_ADDED_LIBRARIES osgText ) 
  • OpenSceneGraph/trunk/src/osgPlugins/osgWidget/CMakeLists.txt

    r8597 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC  
    52    Box.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/osga/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC OSGA_Archive.cpp ReaderWriterOSGA.cpp ) 
    52SET(TARGET_H OSGA_Archive.h ) 
  • OpenSceneGraph/trunk/src/osgPlugins/osgtgz/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterOSGTGZ.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/pfb/CMakeLists.txt

    r7369 r9998  
    1414            libpfdu-util 
    1515    ) 
    16 ELSE(MSVC) 
     16ELSE() 
    1717    SET(TARGET_EXTERNAL_LIBRARIES  
    1818            pfdu pfutil 
    1919    ) 
    20 ENDIF(MSVC) 
     20ENDIF() 
    2121 
    2222SET(TARGET_LIBRARIES_VARS PERFORMER_LIBRARY ) 
  • OpenSceneGraph/trunk/src/osgPlugins/pic/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterPIC.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/png/CMakeLists.txt

    r7364 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) 
    52 
     
    129IF(MSVC) 
    1310    SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT") 
    14 ENDIF(MSVC) 
     11ENDIF() 
    1512 
  • OpenSceneGraph/trunk/src/osgPlugins/quicktime/CMakeLists.txt

    r8132 r9998  
    11IF(WIN32) 
    22    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT") 
    3 ENDIF(WIN32) 
     3ENDIF() 
    44 
    55INCLUDE_DIRECTORIES(${QUICKTIME_INCLUDE_DIR}) 
  • OpenSceneGraph/trunk/src/osgPlugins/rgb/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterRGB.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/rot/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterROT.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/scale/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterSCALE.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/shp/CMakeLists.txt

    r7700 r9998  
    1 SET(TARGET_SRC ESRIShape.cpp ESRIShapeParser.cpp ESRIShapeReaderWriter.cpp XBaseParser.cpp) 
    2 SET(TARGET_H ESRIShape.h ESRIShapeParser.h XBaseParser.h) 
    3 SET(TARGET_ADDED_LIBRARIES osgSim osgTerrain) 
     1SET(TARGET_SRC 
     2    ESRIShape.cpp 
     3    ESRIShapeParser.cpp 
     4    ESRIShapeReaderWriter.cpp 
     5    XBaseParser.cpp) 
     6SET(TARGET_H 
     7    ESRIShape.h 
     8    ESRIShapeParser.h 
     9    XBaseParser.h) 
     10SET(TARGET_ADDED_LIBRARIES 
     11    osgSim 
     12    osgTerrain) 
    413#### end var setup  ### 
    514SETUP_PLUGIN(shp) 
  • OpenSceneGraph/trunk/src/osgPlugins/stl/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterSTL.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/svg/CMakeLists.txt

    r9339 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41INCLUDE_DIRECTORIES( ${RSVG_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}) 
    52LINK_DIRECTORIES(${RSVG_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}) 
  • OpenSceneGraph/trunk/src/osgPlugins/tga/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterTGA.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/tgz/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterTGZ.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/trans/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterTRANS.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/txp/CMakeLists.txt

    r7584 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC 
    52    ReaderWriterTXP.cpp 
  • OpenSceneGraph/trunk/src/osgPlugins/vnc/CMakeLists.txt

    r9339 r9998  
    33INCLUDE_DIRECTORIES(${LIBVNCCLIENT_INCLUDE_DIR}) 
    44 
    5 SET(TARGET_EXTERNAL_LIBRARIES ${LIBVNCCLIENT_LIBRARY} ${ZLIB_LIBRARY} ${JPEG_LIBRARY} ) 
     5SET(TARGET_EXTERNAL_LIBRARIES 
     6    ${LIBVNCCLIENT_LIBRARY} 
     7    ${ZLIB_LIBRARY} 
     8    ${JPEG_LIBRARY} ) 
    69 
    710SET(TARGET_ADDED_LIBRARIES osgWidget ) 
  • OpenSceneGraph/trunk/src/osgPlugins/vrml/CMakeLists.txt

    r9339 r9998  
     1INCLUDE_DIRECTORIES(${OPENVRML_INCLUDE_DIR}) 
     2INCLUDE_DIRECTORIES(${OPENVRML_INCLUDE_DIR}/openvrml) 
     3 
    14IF (WIN32) 
    2     INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) 
    3     FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY NAMES antlr.lib PATHS $ENV{OPENVRML_DIR}/lib) 
    4     FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY_DEBUG NAMES antlrd.lib PATHS $ENV{OPENVRML_DIR}/lib) 
    5     FIND_LIBRARY(OPENVRML_REGEX_LIBRARY NAMES regex.lib PATHS $ENV{OPENVRML_DIR}/lib) 
    6     FIND_LIBRARY(OPENVRML_REGEX_LIBRARY_DEBUG NAMES regexd.lib PATHS $ENV{OPENVRML_DIR}/lib) 
    7     SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY) 
    8     SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib) 
    9 ELSE(WIN32) 
    10     INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml) 
    11     SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY) 
    12 ENDIF(WIN32) 
     5    INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) 
     6    INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) 
     7    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) 
     8 
     9    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY 
     10        NAMES antlr.lib 
     11        PATHS $ENV{OPENVRML_DIR}/lib) 
     12    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY_DEBUG 
     13        NAMES antlrd.lib 
     14        PATHS $ENV{OPENVRML_DIR}/lib) 
     15    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY 
     16        NAMES regex.lib 
     17        PATHS $ENV{OPENVRML_DIR}/lib) 
     18    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY_DEBUG 
     19        NAMES regexd.lib 
     20        PATHS $ENV{OPENVRML_DIR}/lib) 
     21     
     22    SET(TARGET_LIBRARIES_VARS 
     23        OPENVRML_ANTLR_LIBRARY 
     24        OPENVRML_REGEX_LIBRARY 
     25        OPENVRML_LIBRARY 
     26        JPEG_LIBRARY 
     27        PNG_LIBRARY 
     28        ZLIB_LIBRARY) 
     29    SET(TARGET_EXTERNAL_LIBRARIES 
     30        Ws2_32.lib) 
     31ELSE() 
     32    SET(TARGET_LIBRARIES_VARS 
     33        OPENVRML_LIBRARY) 
     34ENDIF() 
    1335 
    1436SET(TARGET_SRC  
    15   IndexedFaceSet.cpp 
    16   Primitives.cpp 
    17   ReaderWriterVRML2.cpp  
     37    IndexedFaceSet.cpp 
     38    Primitives.cpp 
     39    ReaderWriterVRML2.cpp  
    1840) 
    1941 
    2042SET(TARGET_H 
    21   ReaderWriterVRML2.h 
     43    ReaderWriterVRML2.h 
    2244) 
    2345 
  • OpenSceneGraph/trunk/src/osgPlugins/vtf/CMakeLists.txt

    r9425 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterVTF.cpp ) 
    52#### end var setup  ### 
  • OpenSceneGraph/trunk/src/osgPlugins/x/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    4 SET(TARGET_SRC ReaderWriterDirectX.cpp directx.cpp mesh.cpp types.cpp ) 
    5 SET(TARGET_H directx.h mesh.h types.h ) 
     1SET(TARGET_SRC 
     2    ReaderWriterDirectX.cpp 
     3    directx.cpp 
     4    mesh.cpp 
     5    types.cpp ) 
     6SET(TARGET_H 
     7    directx.h 
     8    mesh.h 
     9    types.h ) 
    610#### end var setup  ### 
    711SETUP_PLUGIN(x) 
  • OpenSceneGraph/trunk/src/osgPlugins/xine/CMakeLists.txt

    r9668 r9998  
    1010IF(CMAKE_COMPILER_IS_GNUCXX) 
    1111    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") 
    12 ENDIF(CMAKE_COMPILER_IS_GNUCXX) 
     12ENDIF() 
    1313 
    1414 
  • OpenSceneGraph/trunk/src/osgPlugins/zip/CMakeLists.txt

    r7025 r9998  
    1 #this file is automatically generated  
    2  
    3  
    41SET(TARGET_SRC ReaderWriterZIP.cpp ) 
    52#### end var setup  ###