[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.23 1.24
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Jan 18 17:19:56 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv15686
Modified Files:
FindBoost.cmake
Log Message:
BUG: Fixed additional issues with autodetecting compiler tags properly including Issue #6926
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** FindBoost.cmake 18 Jan 2009 21:40:53 -0000 1.23
--- FindBoost.cmake 18 Jan 2009 22:19:54 -0000 1.24
***************
*** 478,486 ****
if(Boost_DEBUG)
message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
! "using user-specified _boost_COMPILER = ${_boost_COMPILER}")
endif()
else(Boost_COMPILER)
# Attempt to guess the compiler suffix
- SET (_boost_COMPILER "-gcc")
if (MSVC90)
SET (_boost_COMPILER "-vc90")
--- 478,485 ----
if(Boost_DEBUG)
message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
! "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
endif()
else(Boost_COMPILER)
# Attempt to guess the compiler suffix
if (MSVC90)
SET (_boost_COMPILER "-vc90")
***************
*** 490,497 ****
SET (_boost_COMPILER "-vc71")
elseif (MSVC70) # Good luck!
! SET (_boost_COMPILER "-vc70")
elseif (MINGW)
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
! ARGS -dumpversion
OUTPUT_VARIABLE _boost_COMPILER_VERSION
)
--- 489,506 ----
SET (_boost_COMPILER "-vc71")
elseif (MSVC70) # Good luck!
! SET (_boost_COMPILER "-vc7") # yes, this is correct
! elseif (MSVC60) # Good luck!
! SET (_boost_COMPILER "-vc6") # yes, this is correct
! elseif (BORLAND)
! SET (_boost_COMPILER "-bcb")
! elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl")
! if(WIN32)
! set (_boost_COMPILER "-iw")
! else()
! set (_boost_COMPILER "-il")
! endif()
elseif (MINGW)
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
! ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
OUTPUT_VARIABLE _boost_COMPILER_VERSION
)
***************
*** 500,507 ****
SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
elseif (UNIX)
! IF (NOT CMAKE_COMPILER_IS_GNUCC)
! # We assume that we have the Intel compiler.
! SET (_boost_COMPILER "-il")
! ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
# Determine which version of GCC we have.
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
--- 509,513 ----
SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
elseif (UNIX)
! if (CMAKE_COMPILER_IS_GNUCC)
# Determine which version of GCC we have.
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
***************
*** 530,534 ****
SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
ENDIF()
! ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
endif()
if(Boost_DEBUG)
--- 536,540 ----
SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
ENDIF()
! endif (CMAKE_COMPILER_IS_GNUCC)
endif()
if(Boost_DEBUG)
More information about the Cmake-commits
mailing list