Changeset - 2562909b19bb
[Not reviewed]
0 1 0
HanzZ - 13 years ago 2012-07-27 08:25:27
hanzz.k@gmail.com
use boost multithreader
1 file changed with 4 insertions and 4 deletions:
0 comments (0 inline, 0 general)
cmake_modules/BoostConfig.cmake
Show inline comments
 
@@ -592,104 +592,104 @@ ELSE (_boost_IN_CACHE)
 
      SET (_boost_COMPILER "-vc6") # yes, this is correct
 
    elseif (BORLAND)
 
      SET (_boost_COMPILER "-bcb")
 
    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro")
 
      set(_boost_COMPILER "-sw")
 
    elseif (MINGW)
 
      if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
 
          SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
 
      else()
 
        _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
 
        SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
 
      endif()
 
    elseif (UNIX)
 
      if (CMAKE_COMPILER_IS_GNUCXX)
 
        if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
 
          SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
 
        else()
 
          _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
 
          # Determine which version of GCC we have.
 
          IF(APPLE)
 
            IF(Boost_MINOR_VERSION)
 
              IF(${Boost_MINOR_VERSION} GREATER 35)
 
                # In Boost 1.36.0 and newer, the mangled compiler name used
 
                # on Mac OS X/Darwin is "xgcc".
 
                SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
 
              ELSE(${Boost_MINOR_VERSION} GREATER 35)
 
                # In Boost <= 1.35.0, there is no mangled compiler name for
 
                # the Mac OS X/Darwin version of GCC.
 
                SET(_boost_COMPILER "")
 
              ENDIF(${Boost_MINOR_VERSION} GREATER 35)
 
            ELSE(Boost_MINOR_VERSION)
 
              # We don't know the Boost version, so assume it's
 
              # pre-1.36.0.
 
              SET(_boost_COMPILER "")
 
            ENDIF(Boost_MINOR_VERSION)
 
          ELSE()
 
            SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
 
          ENDIF()
 
        endif()
 
      endif (CMAKE_COMPILER_IS_GNUCXX)
 
    endif()
 
    if(Boost_DEBUG)
 
      message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
 
        "guessed _boost_COMPILER = ${_boost_COMPILER}")
 
    endif()
 
  endif(Boost_COMPILER)
 

	
 

	
 
  if(${Boost_MINOR_VERSION} GREATER 41 AND NOT WIN32 AND NOT APPLE)
 
      set (_boost_MULTITHREADED "")
 
  else()
 
#   if(${Boost_MINOR_VERSION} GREATER 41 AND NOT WIN32 AND NOT APPLE)
 
#       set (_boost_MULTITHREADED "")
 
#   else()
 
    SET (_boost_MULTITHREADED "-mt")
 
    if( NOT Boost_USE_MULTITHREADED )
 
      set (_boost_MULTITHREADED "")
 
    endif()
 
  endif()
 
#   endif()
 

	
 
  if(Boost_DEBUG)
 
    message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
 
      "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
 
  endif()
 

	
 
  SET( _boost_STATIC_TAG "")
 
  set( _boost_ABI_TAG "")
 
  IF (WIN32)
 
    IF(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
 
            OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
 
      SET (_boost_ABI_TAG "g")
 
    ENDIF()
 
    IF( Boost_USE_STATIC_LIBS )
 
      SET( _boost_STATIC_TAG "-s")
 
    ENDIF( Boost_USE_STATIC_LIBS )
 
  ENDIF(WIN32)
 
  SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
 
  if(Boost_DEBUG)
 
    message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
 
      "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
 
    message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
 
      "_boost_ABI_TAG = ${_boost_ABI_TAG}")
 
  endif()
 

	
 
  # ------------------------------------------------------------------------
 
  #  Begin finding boost libraries
 
  # ------------------------------------------------------------------------
 

	
 
  SET(_boost_LIBRARIES_SEARCH_DIRS
 
    ${Boost_INCLUDE_DIR}/lib
 
    ${Boost_INCLUDE_DIR}/../lib
 
    C:/boost/lib
 
    C:/boost
 
    "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
 
    "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib"
 
    "$ENV{ProgramFiles}/boost/lib"
 
    "$ENV{ProgramFiles}/boost"
 
    /sw/local/lib
 
  )
 
  IF( BOOST_ROOT )
 
    SET(_boost_LIBRARIES_SEARCH_DIRS 
 
      ${BOOST_ROOT}/lib 
 
      ${BOOST_ROOT}/stage/lib 
 
      ${_boost_LIBRARIES_SEARCH_DIRS})
 
  ENDIF( BOOST_ROOT )
 

	
 
  IF( BOOST_LIBRARYDIR )
0 comments (0 inline, 0 general)