From Philip Lowman, clean up of CMake files

This commit is contained in:
Robert Osfield 2009-04-09 09:23:45 +00:00
parent caee4f4d1b
commit ee4e2afa76
62 changed files with 534 additions and 565 deletions

View File

@ -113,6 +113,10 @@ int main()
" _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) " _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
SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1) NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND
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) 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()

View File

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

View File

@ -13,9 +13,9 @@
# require i386 so this is for the future # require i386 so this is for the future
IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
SET(SYSTEM_ARCH "i386") SET(SYSTEM_ARCH "i386")
ELSE("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") ELSE()
SET(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR}) SET(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR})
ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") ENDIF()
# set a default system name - use CMake setting (Linux|Windows|...) # set a default system name - use CMake setting (Linux|Windows|...)
SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
@ -26,23 +26,24 @@ SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
IF(MSVC) IF(MSVC)
IF(CMAKE_CL_64) IF(CMAKE_CL_64)
SET(SYSTEM_NAME "win64") SET(SYSTEM_NAME "win64")
ELSE(CMAKE_CL_64) ELSE()
SET(SYSTEM_NAME "win32") SET(SYSTEM_NAME "win32")
ENDIF(CMAKE_CL_64) ENDIF()
ENDIF(MSVC) ENDIF()
# Guess the compiler (is this desired for other platforms than windows?) # Guess the compiler (is this desired for other platforms than windows?)
IF(NOT DEFINED OSG_CPACK_COMPILER) IF(NOT DEFINED OSG_CPACK_COMPILER)
INCLUDE(OsgDetermineCompiler) INCLUDE(OsgDetermineCompiler)
ENDIF(NOT DEFINED OSG_CPACK_COMPILER) ENDIF()
# expose the compiler setting to the user # 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") 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) IF(OSG_CPACK_COMPILER)
SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}-${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}) SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH})
ENDIF(OSG_CPACK_COMPILER) ENDIF()
## variables that apply to all packages ## variables that apply to all packages
@ -57,15 +58,15 @@ SET(CPACK_SOURCE_GENERATOR "TGZ")
IF(MSVC_IDE) IF(MSVC_IDE)
SET(OSG_CPACK_CONFIGURATION "$(OutDir)") SET(OSG_CPACK_CONFIGURATION "$(OutDir)")
SET(PACKAGE_TARGET_PREFIX "Package ") SET(PACKAGE_TARGET_PREFIX "Package ")
ELSE(MSVC_IDE) ELSE()
# on un*x an empty CMAKE_BUILD_TYPE means release # on un*x an empty CMAKE_BUILD_TYPE means release
IF(CMAKE_BUILD_TYPE) IF(CMAKE_BUILD_TYPE)
SET(OSG_CPACK_CONFIGURATION ${CMAKE_BUILD_TYPE}) SET(OSG_CPACK_CONFIGURATION ${CMAKE_BUILD_TYPE})
ELSE(CMAKE_BUILD_TYPE) ELSE()
SET(OSG_CPACK_CONFIGURATION "Release") SET(OSG_CPACK_CONFIGURATION "Release")
ENDIF(CMAKE_BUILD_TYPE) ENDIF()
SET(PACKAGE_TARGET_PREFIX "package_") SET(PACKAGE_TARGET_PREFIX "package_")
ENDIF(MSVC_IDE) ENDIF()
# Get all defined components # Get all defined components
GET_CMAKE_PROPERTY(CPACK_COMPONENTS_ALL 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 # 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") 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) 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 # Create a target that will be used to generate all packages defined below
SET(PACKAGE_ALL_TARGETNAME "${PACKAGE_TARGET_PREFIX}ALL") SET(PACKAGE_ALL_TARGETNAME "${PACKAGE_TARGET_PREFIX}ALL")
ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME}) ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME})
#=============================
# Macro:
# GENERATE_PACKAGING_TARGET()
#
MACRO(GENERATE_PACKAGING_TARGET package_name) MACRO(GENERATE_PACKAGING_TARGET package_name)
SET(CPACK_PACKAGE_NAME ${package_name}) SET(CPACK_PACKAGE_NAME ${package_name})
# the doc packages don't need a system-arch specification # the doc packages don't need a system-arch specification
IF(${package} MATCHES -doc) IF(${package} MATCHES -doc)
SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION}) 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}) SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION}-${OSG_CPACK_SYSTEM_SPEC_STRING}-${OSG_CPACK_CONFIGURATION})
IF(NOT DYNAMIC_OPENSCENEGRAPH) IF(NOT DYNAMIC_OPENSCENEGRAPH)
SET(OSG_PACKAGE_FILE_NAME ${OSG_PACKAGE_FILE_NAME}-static) 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) 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}") SET(PACKAGE_TARGETNAME "${PACKAGE_TARGET_PREFIX}${package_name}")
# This is naive and will probably need fixing eventually # This is naive and will probably need fixing eventually
IF(MSVC) IF(WIN32)
SET(MOVE_COMMAND "move") SET(MOVE_COMMAND "move")
ELSE(MSVC) ELSE()
SET(MOVE_COMMAND "mv") SET(MOVE_COMMAND "mv")
ENDIF(MSVC) ENDIF()
# Create a target that creates the current package # Create a target that creates the current package
# and rename the package to give it proper filename # 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" COMMAND ${CMAKE_COMMAND} -E echo "renamed ${CPACK_PACKAGE_FILE_NAME}.tar.gz -> ${OSG_PACKAGE_FILE_NAME}.tar.gz"
) )
ENDMACRO(GENERATE_PACKAGING_TARGET) ENDMACRO(GENERATE_PACKAGING_TARGET)
#
#=============================
# Create configs and targets for a package including all components # Create configs and targets for a package including all components
SET(OSG_CPACK_COMPONENT ALL) SET(OSG_CPACK_COMPONENT ALL)
@ -130,4 +137,4 @@ GENERATE_PACKAGING_TARGET(openscenegraph-all)
FOREACH(package ${CPACK_COMPONENTS_ALL}) FOREACH(package ${CPACK_COMPONENTS_ALL})
SET(OSG_CPACK_COMPONENT ${package}) SET(OSG_CPACK_COMPONENT ${package})
GENERATE_PACKAGING_TARGET(${package}) GENERATE_PACKAGING_TARGET(${package})
ENDFOREACH(package ${CPACK_COMPONENTS_ALL}) ENDFOREACH()

View File

@ -1,81 +1,74 @@
# - 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: # Variable:
# OSG_COMPILER # 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( IF(MSVC60)
${CMAKE_CXX_COMPILER} SET(OSG_COMPILER "vc60")
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion ELSEIF(MSVC70)
OUTPUT_VARIABLE gcc_compiler_version SET(OSG_COMPILER "vc70")
) ELSEIF(MSVC71)
#MESSAGE("GCC Version: ${gcc_compiler_version}") SET(OSG_COMPILER "vc71")
ELSEIF(MSVC80)
SET(OSG_COMPILER "vc80")
ELSEIF(MSVC90)
SET(OSG_COMPILER "vc90")
ENDIF()
ELSE(CMAKE_COMPILER_IS_GNUCXX)
IF(MSVC) IF(MSVC80)
IF(MSVC60) MESSAGE(STATUS "Checking if compiler has service pack 1 installed...")
SET(OSG_COMPILER "vc60") FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" "int main() {return 0;}\n")
ENDIF(MSVC60)
IF(MSVC70) TRY_COMPILE(_TRY_RESULT
SET(OSG_COMPILER "vc70") ${CMAKE_BINARY_DIR}
ENDIF(MSVC70) ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx
IF(MSVC71) CMAKE_FLAGS -D CMAKE_VERBOSE_MAKEFILE=ON
SET(OSG_COMPILER "vc71") OUTPUT_VARIABLE OUTPUT
ENDIF(MSVC71) )
IF(MSVC80)
IF(_TRY_RESULT)
# parse for exact compiler version
STRING(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vc_compiler_version "${OUTPUT}")
IF(vc_compiler_version)
#MESSAGE("${vc_compiler_version}")
STRING(REGEX MATCHALL "[0-9]+" CL_VERSION_LIST "${vc_compiler_version}")
LIST(GET CL_VERSION_LIST 0 CL_MAJOR_VERSION)
LIST(GET CL_VERSION_LIST 1 CL_MINOR_VERSION)
LIST(GET CL_VERSION_LIST 2 CL_PATCH_VERSION)
LIST(GET CL_VERSION_LIST 3 CL_EXTRA_VERSION)
ENDIF(vc_compiler_version)
# Standard vc80 is 14.00.50727.42, sp1 14.00.50727.762, sp2?
# Standard vc90 is 9.0.30729.1, sp1 ?
IF(CL_EXTRA_VERSION EQUAL 762)
SET(OSG_COMPILER "vc80sp1")
ELSE(CL_EXTRA_VERSION EQUAL 762)
SET(OSG_COMPILER "vc80") SET(OSG_COMPILER "vc80")
ENDIF(MSVC80) ENDIF(CL_EXTRA_VERSION EQUAL 762)
IF(MSVC90)
SET(OSG_COMPILER "vc90")
ENDIF(MSVC90)
IF(MSVC80) # parse for exact visual studio version
MESSAGE(STATUS "Checking if compiler has service pack 1 installed...") #IF(MSVC_IDE)
FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" "int main() {return 0;}\n") # string(REGEX MATCH "Visual Studio Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vs_version "${OUTPUT}")
# IF(vs_version)
TRY_COMPILE(_TRY_RESULT # MESSAGE("${vs_version}")
${CMAKE_BINARY_DIR} # string(REGEX MATCHALL "[0-9]+" VS_VERSION_LIST "${vs_version}")
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx # list(GET VS_VERSION_LIST 0 VS_MAJOR_VERSION)
CMAKE_FLAGS -D CMAKE_VERBOSE_MAKEFILE=ON # list(GET VS_VERSION_LIST 1 VS_MINOR_VERSION)
OUTPUT_VARIABLE OUTPUT # list(GET VS_VERSION_LIST 2 VS_PATCH_VERSION)
) # list(GET VS_VERSION_LIST 3 VS_EXTRA_VERSION)
# ENDIF(vs_version)
IF(_TRY_RESULT) #ENDIF(MSVC_IDE)
# parse for exact compiler version ENDIF(_TRY_RESULT)
STRING(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vc_compiler_version "${OUTPUT}") ENDIF(MSVC80)
IF(vc_compiler_version)
#MESSAGE("${vc_compiler_version}")
STRING(REGEX MATCHALL "[0-9]+" CL_VERSION_LIST "${vc_compiler_version}")
LIST(GET CL_VERSION_LIST 0 CL_MAJOR_VERSION)
LIST(GET CL_VERSION_LIST 1 CL_MINOR_VERSION)
LIST(GET CL_VERSION_LIST 2 CL_PATCH_VERSION)
LIST(GET CL_VERSION_LIST 3 CL_EXTRA_VERSION)
ENDIF(vc_compiler_version)
# Standard vc80 is 14.00.50727.42, sp1 14.00.50727.762, sp2?
# Standard vc90 is 9.0.30729.1, sp1 ?
IF(CL_EXTRA_VERSION EQUAL 762)
SET(OSG_COMPILER "vc80sp1")
ELSE(CL_EXTRA_VERSION EQUAL 762)
SET(OSG_COMPILER "vc80")
ENDIF(CL_EXTRA_VERSION EQUAL 762)
# parse for exact visual studio version
#IF(MSVC_IDE)
# string(REGEX MATCH "Visual Studio Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vs_version "${OUTPUT}")
# IF(vs_version)
# MESSAGE("${vs_version}")
# string(REGEX MATCHALL "[0-9]+" VS_VERSION_LIST "${vs_version}")
# list(GET VS_VERSION_LIST 0 VS_MAJOR_VERSION)
# list(GET VS_VERSION_LIST 1 VS_MINOR_VERSION)
# list(GET VS_VERSION_LIST 2 VS_PATCH_VERSION)
# list(GET VS_VERSION_LIST 3 VS_EXTRA_VERSION)
# ENDIF(vs_version)
#ENDIF(MSVC_IDE)
ENDIF(_TRY_RESULT)
ENDIF(MSVC80)
ENDIF(MSVC)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)

View File

@ -1,180 +1,220 @@
INCLUDE(ListHandle) INCLUDE(ListHandle)
#---------------------------------------------------
# Macro: FILTER_OUT FILTERS INPUTS OUTPUT
#
# Mimicks Gnu Make's $(filter-out) which removes elements
# from a list that match the pattern.
# Arguments:
# FILTERS - list of patterns that need to be removed
# INPUTS - list of inputs that will be worked on
# OUTPUT - the filtered list to be returned
#
# Example:
# SET(MYLIST this that and the other)
# SET(FILTS this that)
#
# FILTER_OUT("${FILTS}" "${MYLIST}" OUT)
# MESSAGE("OUTPUT = ${OUT}")
#
# The output -
# OUTPUT = and;the;other
#
#---------------------------------------------------
MACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
SET(FOUT "")
FOREACH(INP ${INPUTS})
SET(FILTERED 0)
MACRO(FILTER_OUT FILTERS INPUTS OUTPUT) FOREACH(FILT ${FILTERS})
# Mimicks Gnu Make's $(filter-out) which removes elements IF(${FILTERED} EQUAL 0)
# from a list that match the pattern. IF("${FILT}" STREQUAL "${INP}")
# Arguments: SET(FILTERED 1)
# FILTERS - list of patterns that need to be removed ENDIF()
# INPUTS - list of inputs that will be worked on ENDIF()
# OUTPUT - the filtered list to be returned ENDFOREACH()
#
# Example:
# SET(MYLIST this that and the other)
# SET(FILTS this that)
#
# FILTER_OUT("${FILTS}" "${MYLIST}" OUT)
# MESSAGE("OUTPUT = ${OUT}")
#
# The output -
# OUTPUT = and;the;other
#
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(${FILTERED} EQUAL 0)
ENDFOREACH(FILT ${FILTERS})
IF(${FILTERED} EQUAL 0)
SET(FOUT ${FOUT} ${INP})
ENDIF(${FILTERED} EQUAL 0)
ENDFOREACH(INP ${INPUTS})
SET(${OUTPUT} ${FOUT})
ENDMACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
IF(${FILTERED} EQUAL 0)
SET(FOUT ${FOUT} ${INP})
ENDIF()
MACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT) ENDFOREACH(INP ${INPUTS})
FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" ) SET(${OUTPUT} ${FOUT})
#FOREACH(F ${TMP}) ENDMACRO()
# MESSAGE(STATUS "header-->${F}<--")
#ENDFOREACH(F ${TMP})
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)
MACRO(ADD_DIRS_TO_ENV_VAR _VARNAME )
FOREACH(_ADD_PATH ${ARGN})
FILE(TO_NATIVE_PATH ${_ADD_PATH} _ADD_NATIVE)
#SET(_CURR_ENV_PATH $ENV{PATH})
#LIST(SET _CURR_ENV_PATH ${_ADD_PATH})
#SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE}
IF(WIN32)
SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}")
ELSE(WIN32)
SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}")
ENDIF(WIN32)
#MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---")
ENDFOREACH(_ADD_PATH)
ENDMACRO(ADD_DIRS_TO_ENV_VAR _VARNAME )
#--------------------------------------------------- #---------------------------------------------------
# MACRO CORRECT_PATH VAR PATH # Macro: GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT
# corrects slashes in PATH to be cmake conformous ( / ) #
#---------------------------------------------------
MACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT)
FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" )
#FOREACH(F ${TMP})
# MESSAGE(STATUS "header-->${F}<--")
#ENDFOREACH(F ${TMP})
FILTER_OUT("${DIR}/CVS" "${TMP}" TMP)
FILTER_OUT("${DIR}/cvs" "${TMP}" ${OUTPUT})
FILTER_OUT("${DIR}/.svn" "${TMP}" ${OUTPUT})
ENDMACRO()
#---------------------------------------------------
# Macro: ADD_DIRS_TO_ENV_VAR _VARNAME
#
#---------------------------------------------------
MACRO(ADD_DIRS_TO_ENV_VAR _VARNAME )
FOREACH(_ADD_PATH ${ARGN})
FILE(TO_NATIVE_PATH ${_ADD_PATH} _ADD_NATIVE)
#SET(_CURR_ENV_PATH $ENV{PATH})
#LIST(SET _CURR_ENV_PATH ${_ADD_PATH})
#SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE}
IF(WIN32)
SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}")
ELSE()
SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}")
ENDIF()
#MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---")
ENDFOREACH()
ENDMACRO()
#---------------------------------------------------
# Macro: CORRECT_PATH VAR PATH
#
# Corrects slashes in PATH to be cmake conformous ( / )
# and puts result in VAR # and puts result in VAR
#--------------------------------------------------- #---------------------------------------------------
MACRO(CORRECT_PATH VAR PATH) MACRO(CORRECT_PATH VAR PATH)
SET(${VAR} ${PATH}) SET(${VAR} ${PATH})
IF(WIN32) IF(WIN32)
STRING(REGEX REPLACE "/" "\\\\" ${VAR} "${PATH}") 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) MACRO(TARGET_LOCATIONS_SET_FILE FILE)
SET(ACCUM_FILE_TARGETS ${FILE}) SET(ACCUM_FILE_TARGETS ${FILE})
FILE(WRITE ${ACCUM_FILE_TARGETS} "") FILE(WRITE ${ACCUM_FILE_TARGETS} "")
ENDMACRO(TARGET_LOCATIONS_SET_FILE FILE) ENDMACRO()
#---------------------------------------------------
# Macro: TARGET_LOCATIONS_ACCUM TARGET_NAME
#
#---------------------------------------------------
MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME) MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME)
IF(ACCUM_FILE_TARGETS) IF(ACCUM_FILE_TARGETS)
IF(EXISTS ${ACCUM_FILE_TARGETS}) IF(EXISTS ${ACCUM_FILE_TARGETS})
GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION) GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION)
FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};") FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};")
#SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll") #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll")
#MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--") #MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--")
#SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION}) #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) MACRO(TARGET_LOCATIONS_GET_LIST _VAR)
IF(ACCUM_FILE_TARGETS) IF(ACCUM_FILE_TARGETS)
IF(EXISTS ${ACCUM_FILE_TARGETS}) IF(EXISTS ${ACCUM_FILE_TARGETS})
FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR}) FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR})
ENDIF(EXISTS ${ACCUM_FILE_TARGETS}) 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) MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST)
MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--")
MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--") SET(MY_PATH_INCLUDE )
SET(MY_PATH_LIB )
SET(MY_PATH_BIN )
SET(MY_PATH_INCLUDE ) FOREACH( MYPATH ${SEARCHPATHLIST} )
SET(MY_PATH_LIB ) SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
SET(MY_PATH_BIN ) SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin)
ENDFOREACH()
FOREACH( MYPATH ${SEARCHPATHLIST} ) SET(MYLIBRARY "${LIBRARY}")
SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include) SEPARATE_ARGUMENTS(MYLIBRARY)
SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin)
ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
SET(MYLIBRARY "${LIBRARY}") #MESSAGE( " include paths: -->${MY_PATH_INCLUDE}<--")
SEPARATE_ARGUMENTS(MYLIBRARY)
#MESSAGE( " include paths: -->${MY_PATH_INCLUDE}<--") #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
#MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE}
${MY_PATH_INCLUDE}
FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE} )
${MY_PATH_INCLUDE} MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
) #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
#MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
FIND_LIBRARY("${DEPNAME}_LIBRARY" FIND_LIBRARY("${DEPNAME}_LIBRARY"
NAMES ${MYLIBRARY} NAMES ${MYLIBRARY}
PATHS ${MY_PATH_LIB} PATHS ${MY_PATH_LIB}
) )
IF(${DEPNAME}_LIBRARY) IF(${DEPNAME}_LIBRARY)
GET_FILENAME_COMPONENT(MYLIBNAME ${${DEPNAME}_LIBRARY} NAME_WE) GET_FILENAME_COMPONENT(MYLIBNAME ${${DEPNAME}_LIBRARY} NAME_WE)
GET_FILENAME_COMPONENT(MYBINPATH ${${DEPNAME}_LIBRARY} PATH) GET_FILENAME_COMPONENT(MYBINPATH ${${DEPNAME}_LIBRARY} PATH)
GET_FILENAME_COMPONENT(MYBINPATH ${MYBINPATH} PATH) GET_FILENAME_COMPONENT(MYBINPATH ${MYBINPATH} PATH)
SET(MYBINPATH "${MYBINPATH}/bin") SET(MYBINPATH "${MYBINPATH}/bin")
IF(EXISTS ${MYBINPATH}) IF(EXISTS ${MYBINPATH})
SET(MYFOUND 0) SET(MYFOUND 0)
FOREACH(MYPATH ${MY_ACCUM_BINARY_DEP}) FOREACH(MYPATH ${MY_ACCUM_BINARY_DEP})
IF(MYPATH MATCHES ${MYBINPATH}) IF(MYPATH MATCHES ${MYBINPATH})
SET(MYFOUND 1) SET(MYFOUND 1)
#MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--") #MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--")
ENDIF(MYPATH MATCHES ${MYBINPATH}) ENDIF()
ENDFOREACH(MYPATH ) ENDFOREACH()
IF(MYFOUND EQUAL 0) IF(MYFOUND EQUAL 0)
SET(MY_ACCUM_BINARY_DEP ${MY_ACCUM_BINARY_DEP} ${MYBINPATH}) 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}<--") #MESSAGE("${DEPNAME}_BINDEP searching -->${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}<--in-->${MY_PATH_BIN}<--")
# FIND_FILE("${DEPNAME}_BINDEP" # FIND_FILE("${DEPNAME}_BINDEP"
# ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX} # ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}
# PATHS ${MY_PATH_BIN} # PATHS ${MY_PATH_BIN}
# ) # )
# FIND_LIBRARY("${DEPNAME}_BINDEP" # FIND_LIBRARY("${DEPNAME}_BINDEP"
# NAMES ${MYLIBRARY} # NAMES ${MYLIBRARY}
# PATHS ${MY_PATH_BIN} # PATHS ${MY_PATH_BIN}
# ) # )
ENDIF(${DEPNAME}_LIBRARY) ENDIF()
MARK_AS_ADVANCED("${DEPNAME}_LIBRARY")
#MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--") MARK_AS_ADVANCED("${DEPNAME}_LIBRARY")
IF(${DEPNAME}_INCLUDE_DIR) #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--")
IF(${DEPNAME}_LIBRARY) IF(${DEPNAME}_INCLUDE_DIR)
SET( ${DEPNAME}_FOUND "YES" ) IF(${DEPNAME}_LIBRARY)
SET( ${DEPNAME}_LIBRARIES ${${DEPNAME}_LIBRARY} ) SET( ${DEPNAME}_FOUND "YES" )
ENDIF(${DEPNAME}_LIBRARY) SET( ${DEPNAME}_LIBRARIES ${${DEPNAME}_LIBRARY} )
ENDIF(${DEPNAME}_INCLUDE_DIR) ENDIF()
ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST) ENDIF()
ENDMACRO()
#---------------------------------------------------
# Macro: MACRO_MESSAGE MYTEXT
#
#---------------------------------------------------
#SET(MACRO_MESSAGE_DEBUG TRUE) #SET(MACRO_MESSAGE_DEBUG TRUE)
MACRO(MACRO_MESSAGE MYTEXT) MACRO(MACRO_MESSAGE MYTEXT)
IF(MACRO_MESSAGE_DEBUG) IF(MACRO_MESSAGE_DEBUG)
MESSAGE("in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message ${MYTEXT}") 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}") 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()

View File

@ -1,22 +1,22 @@
IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@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) FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
STRING(REGEX REPLACE "\n" ";" files "${files}") STRING(REGEX REPLACE "\n" ";" files "${files}")
FOREACH(file ${files}) FOREACH(file ${files})
MESSAGE(STATUS "Uninstalling \"${file}\"") MESSAGE(STATUS "Uninstalling \"${file}\"")
IF(EXISTS "${file}") IF(EXISTS "${file}")
EXEC_PROGRAM( EXEC_PROGRAM(
"@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
OUTPUT_VARIABLE rm_out OUTPUT_VARIABLE rm_out
RETURN_VALUE rm_retval 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}\"")
MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") ENDIF()
ENDIF("${rm_retval}" STREQUAL 0) ELSE()
ELSE(EXISTS "${file}") MESSAGE(STATUS "File \"${file}\" does not exist.")
MESSAGE(STATUS "File \"${file}\" does not exist.") ENDIF()
ENDIF(EXISTS "${file}") ENDFOREACH()
ENDFOREACH(file)

View File

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

View File

@ -1,51 +1,48 @@
#this file is automatically generated
SET(TARGET_SRC SET(TARGET_SRC
ReaderWriter3DS.cpp ReaderWriter3DS.cpp
atmosphere.cpp atmosphere.cpp
background.cpp background.cpp
camera.cpp camera.cpp
chunk.cpp chunk.cpp
ease.cpp ease.cpp
file.cpp file.cpp
lib3ds_float.cpp lib3ds_float.cpp
light.cpp light.cpp
material.cpp material.cpp
matrix.cpp matrix.cpp
mesh.cpp mesh.cpp
node.cpp node.cpp
quat.cpp quat.cpp
readwrite.cpp readwrite.cpp
shadow.cpp shadow.cpp
tcb.cpp tcb.cpp
tracks.cpp tracks.cpp
vector.cpp vector.cpp
viewport.cpp viewport.cpp
) )
SET(TARGET_H SET(TARGET_H
atmosphere.h atmosphere.h
background.h background.h
camera.h camera.h
chunk.h chunk.h
chunktable.h chunktable.h
config.h config.h
ease.h ease.h
file.h file.h
lib3ds_float.h lib3ds_float.h
light.h light.h
material.h material.h
matrix.h matrix.h
mesh.h mesh.h
node.h node.h
quat.h quat.h
readwrite.h readwrite.h
shadow.h shadow.h
tcb.h tcb.h
tracks.h tracks.h
types.h types.h
vector.h vector.h
viewport.h viewport.h
) )
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(3ds) SETUP_PLUGIN(3ds)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,8 +1,8 @@
IF (WIN32) IF (WIN32)
INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4 ${COLLADA_BOOST_INCLUDE_DIR} ) 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) INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
ENDIF (WIN32) ENDIF ()
SET(TARGET_SRC SET(TARGET_SRC
daeReader.cpp daeReader.cpp
@ -27,35 +27,45 @@ SET(TARGET_H
) )
IF (COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY) IF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
OPTION(COLLADA_USE_STATIC "Set to ON to build OpenSceneGraph with static Collada support." OFF) OPTION(COLLADA_USE_STATIC "Set to ON to build OpenSceneGraph with static Collada support." OFF)
ELSEIF(COLLADA_STATIC_LIBRARY)
SET(COLLADA_USE_STATIC "YES")
ELSE()
SET(COLLADA_USE_STATIC "NO")
ENDIF()
ELSE(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY) IF(COLLADA_USE_STATIC)
IF (COLLADA_STATIC_LIBRARY)
SET(COLLADA_USE_STATIC "YES")
ELSE(COLLADA_STATIC_LIBRARY)
SET(COLLADA_USE_STATIC "NO")
ENDIF(COLLADA_STATIC_LIBRARY)
ENDIF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
IF (COLLADA_USE_STATIC)
IF(WIN32) IF(WIN32)
ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB) 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) IF(WIN32)
ADD_DEFINITIONS(-DDOM_DYNAMIC -DBOOST_ALL_NO_LIB) 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 ) SET(TARGET_ADDED_LIBRARIES osgSim )

View File

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

View File

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

View File

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

View File

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

View File

@ -14,7 +14,7 @@ SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} )
IF (FFMPEG_LIBSWSCALE_FOUND) IF(FFMPEG_LIBSWSCALE_FOUND)
INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale )

View File

@ -1,18 +1,22 @@
#this file is automatically generated
IF(WIN32) IF(WIN32)
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT") SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
ENDIF(WIN32) ENDIF()
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} ) INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
IF(APPLE) 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") 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_ADDED_LIBRARIES osgText )
SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY ) SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
#### end var setup ### #### end var setup ###

View File

@ -47,17 +47,13 @@ SET(ALL_REQUIRED_XUL_INCLUDE_DIRS
${XUL_INCLUDE_DIR}/xpconnect ${XUL_INCLUDE_DIR}/xpconnect
) )
IF (WIN32 OR APPLE) IF(WIN32 OR APPLE)
INCLUDE_DIRECTORIES(${ALL_REQUIRED_XUL_INCLUDE_DIRS} ) INCLUDE_DIRECTORIES(${ALL_REQUIRED_XUL_INCLUDE_DIRS} )
SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES}) SET(TARGET_EXTERNAL_LIBRARIES ${XUL_LIBRARIES})
ELSE()
ELSE(WIN32 OR APPLE)
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${ALL_REQUIRED_XUL_INCLUDE_DIRS} ) INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${ALL_REQUIRED_XUL_INCLUDE_DIRS} )
SET(TARGET_EXTERNAL_LIBRARIES ${GTK_LIBRARIES} ${XUL_LIBRARIES}) SET(TARGET_EXTERNAL_LIBRARIES ${GTK_LIBRARIES} ${XUL_LIBRARIES})
ENDIF()
ENDIF(WIN32 OR APPLE)
IF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCXX)

View File

@ -1,18 +1,18 @@
#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 SET(TARGET_H
ClipRegion.h ClipRegion.h
geoCore.h geoCore.h
geoFormat.h geoFormat.h
geoTypes.h geoTypes.h
geoUnits.h geoUnits.h
geoVersion.h geoVersion.h
osgGeoAction.h osgGeoAction.h
osgGeoAnimation.h osgGeoAnimation.h
osgGeoNodes.h osgGeoNodes.h
osgGeoStructs.h osgGeoStructs.h
) )
SET(TARGET_ADDED_LIBRARIES osgSim osgText) SET(TARGET_ADDED_LIBRARIES osgSim osgText)
#### end var setup ### #### end var setup ###

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,8 +1,4 @@
#this file is automatically generated INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
SET(TARGET_SRC ReaderWriterJPEG.cpp ) SET(TARGET_SRC ReaderWriterJPEG.cpp )
SET(TARGET_LIBRARIES_VARS JPEG_LIBRARY ) SET(TARGET_LIBRARIES_VARS JPEG_LIBRARY )

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,15 +1,13 @@
#this file is automatically generated
SET(TARGET_SRC SET(TARGET_SRC
IO_AnisotropicLighting.cpp IO_AnisotropicLighting.cpp
IO_BumpMapping.cpp IO_BumpMapping.cpp
IO_Cartoon.cpp IO_Cartoon.cpp
IO_Effect.cpp IO_Effect.cpp
IO_MultiTextureControl.cpp IO_MultiTextureControl.cpp
IO_Scribe.cpp IO_Scribe.cpp
IO_SpecularHighlights.cpp IO_SpecularHighlights.cpp
) )
SET(TARGET_ADDED_LIBRARIES osgFX ) SET(TARGET_ADDED_LIBRARIES osgFX )
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(osgfx) SETUP_PLUGIN(osgfx)

View File

@ -1,39 +1,37 @@
#this file is automatically generated
SET(TARGET_SRC SET(TARGET_SRC
IO_AccelOperator.cpp IO_AccelOperator.cpp
IO_AngularAccelOperator.cpp IO_AngularAccelOperator.cpp
IO_BoxPlacer.cpp IO_BoxPlacer.cpp
IO_CenteredPlacer.cpp IO_CenteredPlacer.cpp
IO_ConnectedParticleSystem.cpp IO_ConnectedParticleSystem.cpp
IO_ConstantRateCounter.cpp IO_ConstantRateCounter.cpp
IO_Emitter.cpp IO_Emitter.cpp
IO_ExplosionDebrisEffect.cpp IO_ExplosionDebrisEffect.cpp
IO_ExplosionEffect.cpp IO_ExplosionEffect.cpp
IO_FireEffect.cpp IO_FireEffect.cpp
IO_FluidFrictionOperator.cpp IO_FluidFrictionOperator.cpp
IO_FluidProgram.cpp IO_FluidProgram.cpp
IO_ForceOperator.cpp IO_ForceOperator.cpp
IO_LinearInterpolator.cpp IO_LinearInterpolator.cpp
IO_ModularEmitter.cpp IO_ModularEmitter.cpp
IO_ModularProgram.cpp IO_ModularProgram.cpp
IO_MultiSegmentPlacer.cpp IO_MultiSegmentPlacer.cpp
IO_Particle.cpp IO_Particle.cpp
IO_ParticleEffect.cpp IO_ParticleEffect.cpp
IO_ParticleProcessor.cpp IO_ParticleProcessor.cpp
IO_ParticleSystem.cpp IO_ParticleSystem.cpp
IO_ParticleSystemUpdater.cpp IO_ParticleSystemUpdater.cpp
IO_PointPlacer.cpp IO_PointPlacer.cpp
IO_Program.cpp IO_Program.cpp
IO_RadialShooter.cpp IO_RadialShooter.cpp
IO_RandomRateCounter.cpp IO_RandomRateCounter.cpp
IO_SectorPlacer.cpp IO_SectorPlacer.cpp
IO_SegmentPlacer.cpp IO_SegmentPlacer.cpp
IO_SmokeEffect.cpp IO_SmokeEffect.cpp
IO_SmokeTrailEffect.cpp IO_SmokeTrailEffect.cpp
IO_VariableRateCounter.cpp IO_VariableRateCounter.cpp
) )
SET(TARGET_ADDED_LIBRARIES osgParticle ) SET(TARGET_ADDED_LIBRARIES osgParticle )
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(osgparticle) SETUP_PLUGIN(osgparticle)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 ### #### end var setup ###
SETUP_PLUGIN(shp) SETUP_PLUGIN(shp)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,7 +2,10 @@ SET(TARGET_SRC ReaderWriterVNC.cpp )
INCLUDE_DIRECTORIES(${LIBVNCCLIENT_INCLUDE_DIR}) 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 ) SET(TARGET_ADDED_LIBRARIES osgWidget )

View File

@ -1,24 +1,46 @@
INCLUDE_DIRECTORIES(${OPENVRML_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${OPENVRML_INCLUDE_DIR}/openvrml)
IF (WIN32) 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 SET(TARGET_SRC
IndexedFaceSet.cpp IndexedFaceSet.cpp
Primitives.cpp Primitives.cpp
ReaderWriterVRML2.cpp ReaderWriterVRML2.cpp
) )
SET(TARGET_H SET(TARGET_H
ReaderWriterVRML2.h ReaderWriterVRML2.h
) )
#### end var setup ### #### end var setup ###

View File

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

View File

@ -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 ### #### end var setup ###
SETUP_PLUGIN(x) SETUP_PLUGIN(x)

View File

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

View File

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