Commitce12fbe

committed

Upgrade Boost to 1.54.0; support C++11 for Clang in OS X only.

1 parent2e07a3d commitce12fbeCopy full SHA for ce12fbe

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ else()`
`20`	`20`	`endif()`
`21`	`21`
`22`	`22`	`set(Boost_USE_MULTI_THREADEDON)`
`23`		`-find_package(Boost1.45.0REQUIREDunit_test_frameworksystemregexdate_timethreadfilesystemprogram_optionschrono )`
	`23`	`+find_package(Boost1.54.0REQUIREDunit_test_frameworksystemregexdate_timethreadfilesystemprogram_optionschrono )`
`24`	`24`	`find_package(OpenSSL )`
`25`	`25`	`find_package(Threads )`
`26`	`26`	`set(CMAKE_VERBOSE_MAKEFILEtrue)`
`@@ -37,9 +37,17 @@ endif()`
`37`	`37`	`if (${CMAKE_CXX_COMPILER_ID}MATCHESGNU)`
`38`	`38`	`set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall")`
`39`	`39`	`elseif (${CMAKE_CXX_COMPILER_ID}MATCHESClang)`
`40`		`-set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256")`
	`40`	`+ if (${CMAKE_SYSTEM_NAME}MATCHES"Darwin")`
	`41`	`+# We want to link in C++11 mode if we're using Clang and on OS X.`
	`42`	`+set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -stdlib=libc++")`
	`43`	`+ else()`
	`44`	`+# We just add the -Wall and a high enough template depth`
	`45`	`+# flag for Clang in other systems.`
	`46`	`+set (CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -Wall -ftemplate-dempth=256")`
	`47`	`+ endif()`
`41`	`48`	`endif()`
`42`	`49`
	`50`	`+`
`43`	`51`	`if (Boost_FOUND)`
`44`	`52`	`if (MSVC)`
`45`	`53`	`add_definitions(-D_SCL_SECURE_NO_WARNINGS)`

Comments

(0)