← Back to branch summary

~dynamite-a-d/ubuntu/precise/cmake/fix-for-972419

« back to all changes in this revision

Viewing changes to .pc/FindBoost_add_-lpthread_#563479.diff/Modules/FindBoost.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-11 00:51:46 UTC
  • mfrom: (3.1.24 sid)
  • Revision ID: james.westby@ubuntu.com-20110711005146-v81594j17p4gqjrd
Tags: 2.8.5-1ubuntu1
Disable CTestTestUpload test as it requires internet access.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/FindBoost_add_-lpthread_#563479.diff/Modules/FindBoost.cmake
65
65
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
66
66
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
67
67
# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0,
68
 
# 1.45, 1.45.0, 1.46, 1.46.0
 
68
# 1.45, 1.45.0, 1.46, 1.46.0, 1.46.1
69
69
#
70
70
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
71
71
# add both 1.x and 1.x.0 as shown above.  Official Boost include directories
281
281
      set(Boost_${basename}_LIBRARY         ${Boost_${basename}_LIBRARY_DEBUG})
282
282
      set(Boost_${basename}_LIBRARIES       ${Boost_${basename}_LIBRARY_DEBUG})
283
283
    endif()
 
284
 
 
285
    # If the debug & release library ends up being the same, omit the keywords
 
286
    if(${Boost_${basename}_LIBRARY_RELEASE} STREQUAL ${Boost_${basename}_LIBRARY_DEBUG})
 
287
      set(Boost_${basename}_LIBRARY   ${Boost_${basename}_LIBRARY_RELEASE} )
 
288
      set(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE} )
 
289
    endif()
284
290
    
285
291
    if(Boost_${basename}_LIBRARY)
286
292
      set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
386
392
  # The user has not requested an exact version.  Among known
387
393
  # versions, find those that are acceptable to the user request.
388
394
  set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
 
395
    "1.46.1"
389
396
    "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
390
397
    "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
391
398
    "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"