[Cmake-commits] [cmake-commits] king committed FindBISON.cmake 1.1 1.2 FindBullet.cmake 1.1 1.2 FindCUDA.cmake 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Sep 25 15:42:55 EDT 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv25124/Modules

Modified Files:
	FindBISON.cmake FindBullet.cmake FindCUDA.cmake 
Log Message:
Convert newlines from CRLF to LF

These files were committed to the repository with Windows newlines.
This converts them to Unix newlines so they will show up natively.


Index: FindBISON.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBISON.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** FindBISON.cmake	13 Aug 2009 04:11:23 -0000	1.1
--- FindBISON.cmake	25 Sep 2009 19:42:53 -0000	1.2
***************
*** 1,167 ****
! # - Find bison executable and provides macros to generate custom build rules
! # The module defines the following variables:
! #
! #  BISON_EXECUTABLE - path to the bison program
! #  BISON_VERSION - version of bison
! #  BISON_FOUND - true if the program was found
! #
! # If bison is found, the module defines the macros:
! #  BISON_TARGET(<Name> <YaccInput> <CodeOutput> [VERBOSE <file>]
! #              [COMPILE_FLAGS <string>])
! # which will create  a custom rule to generate  a parser. <YaccInput> is
! # the path to  a yacc file. <CodeOutput> is the name  of the source file
! # generated by bison.  A header file is also  be generated, and contains
! # the  token  list.  If  COMPILE_FLAGS  option is  specified,  the  next
! # parameter is  added in the bison  command line.  if  VERBOSE option is
! # specified, <file> is created  and contains verbose descriptions of the
! # grammar and parser. The macro defines a set of variables:
! #  BISON_${Name}_DEFINED - true is the macro ran successfully
! #  BISON_${Name}_INPUT - The input source file, an alias for <YaccInput>
! #  BISON_${Name}_OUTPUT_SOURCE - The source file generated by bison
! #  BISON_${Name}_OUTPUT_HEADER - The header file generated by bison
! #  BISON_${Name}_OUTPUTS - The sources files generated by bison
! #  BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line
! #
! #====================================================================
! # Example:
! #
! # find_package(BISON)
! # BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
! # add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
! #====================================================================
! 
! # Copyright (c) 2006, Tristan Carel
! # All rights reserved.
! # Redistribution and use in source and binary forms, with or without
! # modification, are permitted provided that the following conditions are met:
! #
! #     * Redistributions of source code must retain the above copyright
! #       notice, this list of conditions and the following disclaimer.
! #     * Redistributions in binary form must reproduce the above copyright
! #       notice, this list of conditions and the following disclaimer in the
! #       documentation and/or other materials provided with the distribution.
! #     * Neither the name of the University of California, Berkeley nor the
! #       names of its contributors may be used to endorse or promote products
! #       derived from this software without specific prior written permission.
! #
! # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
! # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
! # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! # DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
! # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
! # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
! # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
! # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
! # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! 
! # $Id$
! 
! FIND_PROGRAM(BISON_EXECUTABLE bison DOC "path to the bison executable")
! MARK_AS_ADVANCED(BISON_EXECUTABLE)
! 
! IF(BISON_EXECUTABLE)
! 
!   EXECUTE_PROCESS(COMMAND ${BISON_EXECUTABLE} --version
!     OUTPUT_VARIABLE BISON_version_output
!     ERROR_VARIABLE BISON_version_error
!     RESULT_VARIABLE BISON_version_result
!     OUTPUT_STRIP_TRAILING_WHITESPACE)
!   IF(NOT ${BISON_version_result} EQUAL 0)
!     MESSAGE(SEND_ERROR "Command \"${BISON_EXECUTABLE} --version\" failed with output:\n${BISON_version_error}")
!   ELSE()
!     STRING(REGEX REPLACE "^bison \\(GNU Bison\\) ([^\n]+)\n.*" "\\1"
!       BISON_VERSION "${BISON_version_output}")
!   ENDIF()
! 
!   # internal macro
!   MACRO(BISON_TARGET_option_verbose Name BisonOutput filename)
!     LIST(APPEND BISON_TARGET_cmdopt "--verbose")
!     GET_FILENAME_COMPONENT(BISON_TARGET_output_path "${BisonOutput}" PATH)
!     GET_FILENAME_COMPONENT(BISON_TARGET_output_name "${BisonOutput}" NAME_WE)
!     ADD_CUSTOM_COMMAND(OUTPUT ${filename}
!       COMMAND ${CMAKE_COMMAND}
!       ARGS -E copy
!       "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
!       "${filename}"
!       DEPENDS
!       "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
!       COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}"
!       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
!     SET(BISON_${Name}_VERBOSE_FILE ${filename})
!     LIST(APPEND BISON_TARGET_extraoutputs
!       "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output")
!   ENDMACRO(BISON_TARGET_option_verbose)
! 
!   # internal macro
!   MACRO(BISON_TARGET_option_extraopts Options)
!     SET(BISON_TARGET_extraopts "${Options}")
!     SEPARATE_ARGUMENTS(BISON_TARGET_extraopts)
!     LIST(APPEND BISON_TARGET_cmdopt ${BISON_TARGET_extraopts})
!   ENDMACRO(BISON_TARGET_option_extraopts)
! 
!   #============================================================
!   # BISON_TARGET (public macro)
!   #============================================================
!   #
!   MACRO(BISON_TARGET Name BisonInput BisonOutput)
!     SET(BISON_TARGET_output_header "")
!     SET(BISON_TARGET_command_opt "")
!     SET(BISON_TARGET_outputs "${BisonOutput}")
!     IF(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
!       MESSAGE(SEND_ERROR "Usage")
!     ELSE()
!       # Parsing parameters
!       IF(${ARGC} GREATER 5 OR ${ARGC} EQUAL 5)
!         IF("${ARGV3}" STREQUAL "VERBOSE")
!           BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV4}")
!         ENDIF()
!         IF("${ARGV3}" STREQUAL "COMPILE_FLAGS")
!           BISON_TARGET_option_extraopts("${ARGV4}")
!         ENDIF()
!       ENDIF()
! 
!       IF(${ARGC} EQUAL 7)
!         IF("${ARGV5}" STREQUAL "VERBOSE")
!           BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV6}")
!         ENDIF()
!       
!         IF("${ARGV5}" STREQUAL "COMPILE_FLAGS")
!           BISON_TARGET_option_extraopts("${ARGV6}")
!         ENDIF()
!       ENDIF()
! 
!       # Header's name generated by bison (see option -d)
!       LIST(APPEND BISON_TARGET_cmdopt "-d")
!       STRING(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\2" _fileext "${ARGV2}")
!       STRING(REPLACE "c" "h" _fileext ${_fileext})
!       STRING(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1${_fileext}" 
!           BISON_${Name}_OUTPUT_HEADER "${ARGV2}")
!       LIST(APPEND BISON_TARGET_outputs "${BISON_${Name}_OUTPUT_HEADER}")
!         
!       ADD_CUSTOM_COMMAND(OUTPUT ${BISON_TARGET_outputs}
!         ${BISON_TARGET_extraoutputs}
!         COMMAND ${BISON_EXECUTABLE}
!         ARGS ${BISON_TARGET_cmdopt} -o ${ARGV2} ${ARGV1}
!         DEPENDS ${ARGV1}
!         COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"
!         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
!     
!       # define target variables
!       SET(BISON_${Name}_DEFINED TRUE)
!       SET(BISON_${Name}_INPUT ${ARGV1})
!       SET(BISON_${Name}_OUTPUTS ${BISON_TARGET_outputs})
!       SET(BISON_${Name}_COMPILE_FLAGS ${BISON_TARGET_cmdopt})
!       SET(BISON_${Name}_OUTPUT_SOURCE "${BisonOutput}")
! 
!     ENDIF(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
!   ENDMACRO(BISON_TARGET)
!   #
!   #============================================================
! 
! ENDIF(BISON_EXECUTABLE)
! 
! INCLUDE(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON DEFAULT_MSG BISON_EXECUTABLE)
! 
! # FindBISON.cmake ends here
--- 1,167 ----
! # - Find bison executable and provides macros to generate custom build rules
! # The module defines the following variables:
! #
! #  BISON_EXECUTABLE - path to the bison program
! #  BISON_VERSION - version of bison
! #  BISON_FOUND - true if the program was found
! #
! # If bison is found, the module defines the macros:
! #  BISON_TARGET(<Name> <YaccInput> <CodeOutput> [VERBOSE <file>]
! #              [COMPILE_FLAGS <string>])
! # which will create  a custom rule to generate  a parser. <YaccInput> is
! # the path to  a yacc file. <CodeOutput> is the name  of the source file
! # generated by bison.  A header file is also  be generated, and contains
! # the  token  list.  If  COMPILE_FLAGS  option is  specified,  the  next
! # parameter is  added in the bison  command line.  if  VERBOSE option is
! # specified, <file> is created  and contains verbose descriptions of the
! # grammar and parser. The macro defines a set of variables:
! #  BISON_${Name}_DEFINED - true is the macro ran successfully
! #  BISON_${Name}_INPUT - The input source file, an alias for <YaccInput>
! #  BISON_${Name}_OUTPUT_SOURCE - The source file generated by bison
! #  BISON_${Name}_OUTPUT_HEADER - The header file generated by bison
! #  BISON_${Name}_OUTPUTS - The sources files generated by bison
! #  BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line
! #
! #====================================================================
! # Example:
! #
! # find_package(BISON)
! # BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
! # add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS})
! #====================================================================
! 
! # Copyright (c) 2006, Tristan Carel
! # All rights reserved.
! # Redistribution and use in source and binary forms, with or without
! # modification, are permitted provided that the following conditions are met:
! #
! #     * Redistributions of source code must retain the above copyright
! #       notice, this list of conditions and the following disclaimer.
! #     * Redistributions in binary form must reproduce the above copyright
! #       notice, this list of conditions and the following disclaimer in the
! #       documentation and/or other materials provided with the distribution.
! #     * Neither the name of the University of California, Berkeley nor the
! #       names of its contributors may be used to endorse or promote products
! #       derived from this software without specific prior written permission.
! #
! # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
! # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
! # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! # DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
! # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
! # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
! # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
! # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
! # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! 
! # $Id$
! 
! FIND_PROGRAM(BISON_EXECUTABLE bison DOC "path to the bison executable")
! MARK_AS_ADVANCED(BISON_EXECUTABLE)
! 
! IF(BISON_EXECUTABLE)
! 
!   EXECUTE_PROCESS(COMMAND ${BISON_EXECUTABLE} --version
!     OUTPUT_VARIABLE BISON_version_output
!     ERROR_VARIABLE BISON_version_error
!     RESULT_VARIABLE BISON_version_result
!     OUTPUT_STRIP_TRAILING_WHITESPACE)
!   IF(NOT ${BISON_version_result} EQUAL 0)
!     MESSAGE(SEND_ERROR "Command \"${BISON_EXECUTABLE} --version\" failed with output:\n${BISON_version_error}")
!   ELSE()
!     STRING(REGEX REPLACE "^bison \\(GNU Bison\\) ([^\n]+)\n.*" "\\1"
!       BISON_VERSION "${BISON_version_output}")
!   ENDIF()
! 
!   # internal macro
!   MACRO(BISON_TARGET_option_verbose Name BisonOutput filename)
!     LIST(APPEND BISON_TARGET_cmdopt "--verbose")
!     GET_FILENAME_COMPONENT(BISON_TARGET_output_path "${BisonOutput}" PATH)
!     GET_FILENAME_COMPONENT(BISON_TARGET_output_name "${BisonOutput}" NAME_WE)
!     ADD_CUSTOM_COMMAND(OUTPUT ${filename}
!       COMMAND ${CMAKE_COMMAND}
!       ARGS -E copy
!       "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
!       "${filename}"
!       DEPENDS
!       "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output"
!       COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}"
!       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
!     SET(BISON_${Name}_VERBOSE_FILE ${filename})
!     LIST(APPEND BISON_TARGET_extraoutputs
!       "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output")
!   ENDMACRO(BISON_TARGET_option_verbose)
! 
!   # internal macro
!   MACRO(BISON_TARGET_option_extraopts Options)
!     SET(BISON_TARGET_extraopts "${Options}")
!     SEPARATE_ARGUMENTS(BISON_TARGET_extraopts)
!     LIST(APPEND BISON_TARGET_cmdopt ${BISON_TARGET_extraopts})
!   ENDMACRO(BISON_TARGET_option_extraopts)
! 
!   #============================================================
!   # BISON_TARGET (public macro)
!   #============================================================
!   #
!   MACRO(BISON_TARGET Name BisonInput BisonOutput)
!     SET(BISON_TARGET_output_header "")
!     SET(BISON_TARGET_command_opt "")
!     SET(BISON_TARGET_outputs "${BisonOutput}")
!     IF(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
!       MESSAGE(SEND_ERROR "Usage")
!     ELSE()
!       # Parsing parameters
!       IF(${ARGC} GREATER 5 OR ${ARGC} EQUAL 5)
!         IF("${ARGV3}" STREQUAL "VERBOSE")
!           BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV4}")
!         ENDIF()
!         IF("${ARGV3}" STREQUAL "COMPILE_FLAGS")
!           BISON_TARGET_option_extraopts("${ARGV4}")
!         ENDIF()
!       ENDIF()
! 
!       IF(${ARGC} EQUAL 7)
!         IF("${ARGV5}" STREQUAL "VERBOSE")
!           BISON_TARGET_option_verbose(${Name} ${BisonOutput} "${ARGV6}")
!         ENDIF()
!       
!         IF("${ARGV5}" STREQUAL "COMPILE_FLAGS")
!           BISON_TARGET_option_extraopts("${ARGV6}")
!         ENDIF()
!       ENDIF()
! 
!       # Header's name generated by bison (see option -d)
!       LIST(APPEND BISON_TARGET_cmdopt "-d")
!       STRING(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\2" _fileext "${ARGV2}")
!       STRING(REPLACE "c" "h" _fileext ${_fileext})
!       STRING(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1${_fileext}" 
!           BISON_${Name}_OUTPUT_HEADER "${ARGV2}")
!       LIST(APPEND BISON_TARGET_outputs "${BISON_${Name}_OUTPUT_HEADER}")
!         
!       ADD_CUSTOM_COMMAND(OUTPUT ${BISON_TARGET_outputs}
!         ${BISON_TARGET_extraoutputs}
!         COMMAND ${BISON_EXECUTABLE}
!         ARGS ${BISON_TARGET_cmdopt} -o ${ARGV2} ${ARGV1}
!         DEPENDS ${ARGV1}
!         COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}"
!         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
!     
!       # define target variables
!       SET(BISON_${Name}_DEFINED TRUE)
!       SET(BISON_${Name}_INPUT ${ARGV1})
!       SET(BISON_${Name}_OUTPUTS ${BISON_TARGET_outputs})
!       SET(BISON_${Name}_COMPILE_FLAGS ${BISON_TARGET_cmdopt})
!       SET(BISON_${Name}_OUTPUT_SOURCE "${BisonOutput}")
! 
!     ENDIF(NOT ${ARGC} EQUAL 3 AND NOT ${ARGC} EQUAL 5 AND NOT ${ARGC} EQUAL 7)
!   ENDMACRO(BISON_TARGET)
!   #
!   #============================================================
! 
! ENDIF(BISON_EXECUTABLE)
! 
! INCLUDE(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON DEFAULT_MSG BISON_EXECUTABLE)
! 
! # FindBISON.cmake ends here

Index: FindBullet.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBullet.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** FindBullet.cmake	17 Aug 2009 03:07:15 -0000	1.1
--- FindBullet.cmake	25 Sep 2009 19:42:53 -0000	1.2
***************
*** 1,75 ****
! # - Try to find the Bullet physics engine
! #
! #  This module defines the following variables
! #
! #  BULLET_FOUND - Was bullet found
! #  BULLET_INCLUDE_DIRS - the Bullet include directories
! #  BULLET_LIBRARIES - Link to this, by default it includes
! #                     all bullet components (Dynamics,
! #                     Collision, LinearMath, & SoftBody)
! #
! #  This module accepts the following variables
! #
! #  BULLET_ROOT - Can be set to bullet install path or Windows build path
! #
! 
! # Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
! #
! # Redistribution AND use is allowed according to the terms of the New
! # BSD license.
! # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
! 
! macro(_FIND_BULLET_LIBRARY _var)
!   find_library(${_var}
!      NAMES 
!         ${ARGN}
!      PATHS
!         ${BULLET_ROOT}
!         ${BULLET_ROOT}/out/release8/libs
!         ${BULLET_ROOT}/out/debug8/libs
!      PATH_SUFFIXES lib
!   )
!   mark_as_advanced(${_var})
! endmacro()
! 
! macro(_BULLET_APPEND_LIBRARIES _list _release)
!    set(_debug ${_release}_DEBUG)
!    if(${_debug})
!       set(${_list} ${${_list}} optimized ${${_release}} debug ${${_debug}})
!    else()
!       set(${_list} ${${_list}} ${${_release}})
!    endif()
! endmacro()
! 
! find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
!   PATHS
!     ${BULLET_ROOT}/include
!     ${BULLET_ROOT}/src
! )
! 
! # Find the libraries
! 
! _FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY        BulletDynamics)
! _FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG  BulletDynamics_d)
! _FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY       BulletCollision)
! _FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_d)
! _FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY            LinearMath BulletMath)
! _FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG      LinearMath_d BulletMath_d)
! _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY        BulletSoftBody)
! _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG  BulletSoftBody_d)
! 
! 
! # handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if 
! # all listed variables are TRUE
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG
!     BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
!     BULLET_SOFTBODY_LIBRARY BULLET_INCLUDE_DIR)
! 
! set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
! if(BULLET_FOUND)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_SOFTBODY_LIBRARY)
! endif()
--- 1,75 ----
! # - Try to find the Bullet physics engine
! #
! #  This module defines the following variables
! #
! #  BULLET_FOUND - Was bullet found
! #  BULLET_INCLUDE_DIRS - the Bullet include directories
! #  BULLET_LIBRARIES - Link to this, by default it includes
! #                     all bullet components (Dynamics,
! #                     Collision, LinearMath, & SoftBody)
! #
! #  This module accepts the following variables
! #
! #  BULLET_ROOT - Can be set to bullet install path or Windows build path
! #
! 
! # Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
! #
! # Redistribution AND use is allowed according to the terms of the New
! # BSD license.
! # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
! 
! macro(_FIND_BULLET_LIBRARY _var)
!   find_library(${_var}
!      NAMES 
!         ${ARGN}
!      PATHS
!         ${BULLET_ROOT}
!         ${BULLET_ROOT}/out/release8/libs
!         ${BULLET_ROOT}/out/debug8/libs
!      PATH_SUFFIXES lib
!   )
!   mark_as_advanced(${_var})
! endmacro()
! 
! macro(_BULLET_APPEND_LIBRARIES _list _release)
!    set(_debug ${_release}_DEBUG)
!    if(${_debug})
!       set(${_list} ${${_list}} optimized ${${_release}} debug ${${_debug}})
!    else()
!       set(${_list} ${${_list}} ${${_release}})
!    endif()
! endmacro()
! 
! find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
!   PATHS
!     ${BULLET_ROOT}/include
!     ${BULLET_ROOT}/src
! )
! 
! # Find the libraries
! 
! _FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY        BulletDynamics)
! _FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG  BulletDynamics_d)
! _FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY       BulletCollision)
! _FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_d)
! _FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY            LinearMath BulletMath)
! _FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG      LinearMath_d BulletMath_d)
! _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY        BulletSoftBody)
! _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG  BulletSoftBody_d)
! 
! 
! # handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if 
! # all listed variables are TRUE
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG
!     BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
!     BULLET_SOFTBODY_LIBRARY BULLET_INCLUDE_DIR)
! 
! set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
! if(BULLET_FOUND)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
!    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_SOFTBODY_LIBRARY)
! endif()

Index: FindCUDA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** FindCUDA.cmake	25 Sep 2009 04:28:12 -0000	1.3
--- FindCUDA.cmake	25 Sep 2009 19:42:53 -0000	1.4
***************
*** 1,1205 ****
! # - Tools for building CUDA C files: libraries and build dependencies.
! # This script locates the NVIDIA CUDA C tools. It should work on linux, windows,
! # and mac and should be reasonably up to date with CUDA C releases.
! #
! # This script makes use of the standard find_package arguments of <VERSION>,
! # REQUIRED and QUIET.  CUDA_FOUND will report if an acceptable version of CUDA
! # was found.
! #
! # The script will prompt the user to specify CUDA_TOOLKIT_ROOT_DIR if the prefix
! # cannot be determined by the location of nvcc in the system path and REQUIRED
[...2381 lines suppressed...]
! # CUDA BUILD CLEAN TARGET
! ###############################################################################
! ###############################################################################
! macro(CUDA_BUILD_CLEAN_TARGET)
!   # Call this after you add all your CUDA targets, and you will get a convience
!   # target.  You should also make clean after running this target to get the
!   # build system to generate all the code again.
! 
!   set(cuda_clean_target_name clean_cuda_depends)
!   if (CMAKE_GENERATOR MATCHES "Visual Studio")
!     string(TOUPPER ${cuda_clean_target_name} cuda_clean_target_name)
!   endif()
!   add_custom_target(${cuda_clean_target_name}
!     COMMAND ${CMAKE_COMMAND} -E remove ${CUDA_ADDITIONAL_CLEAN_FILES})
! 
!   # Clear out the variable, so the next time we configure it will be empty.
!   # This is useful so that the files won't persist in the list after targets
!   # have been removed.
!   set(CUDA_ADDITIONAL_CLEAN_FILES "" CACHE INTERNAL "List of intermediate files that are part of the cuda dependency scanning.")
! endmacro(CUDA_BUILD_CLEAN_TARGET)



More information about the Cmake-commits mailing list