Commit60ad281

committed

Merge pull request#274 from rjeczalik/master-integration

One last small change for CMakeLists and CMAKE_CXX_FLAGS. (#260)

2 parents1150d2a +efaeeb7 commit60ad281Copy full SHA for 60ad281

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ option( CPP-NETLIB_ALWAYS_LOGGING "Allow cpp-netlib to log debug messages even i`
`15`	`15`	`option(CPP-NETLIB_DISABLE_LOGGING"Disable logging definitely, no logging code will be generated or compiled."OFF )`
`16`	`16`	`option(CPP-NETLIB_DISABLE_LIBCXX"Disable using libc++ when compiling with clang."OFF )`
`17`	`17`
`18`		`-`
`19`	`18`	`set(CMAKE_MODULE_PATH${CMAKE_CURRENT_SOURCE_DIR})`
`20`	`19`	`find_package(ICU )`
`21`	`20`
`@@ -39,8 +38,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)`
`39`	`38`	`add_definitions(-DNETWORK_DEBUG)`
`40`	`39`	`endif()`
`41`	`40`
`42`		`-`
`43`		`-`
`44`	`41`	`if (OPENSSL_FOUND)`
`45`	`42`	`add_definitions(-DNETWORK_ENABLE_HTTPS)`
`46`	`43`	`endif()`
`@@ -49,7 +46,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)`
`49`	`46`	`INCLUDE(CheckCXXCompilerFlag)`
`50`	`47`	`CHECK_CXX_COMPILER_FLAG(-std=c++11HAVE_STD11)`
`51`	`48`	`if (HAVE_STD11)`
`52`		`-set(CMAKE_CXX_FLAGS${CMAKE_CXX_FLAGS}"-std=c++11 -Wall")`
	`49`	`+set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -std=c++11 -Wall")`
`53`	`50`	`else()`
`54`	`51`	`message(FATAL_ERROR"No advanced standard C++ support (-std=c++11 not defined).")`
`55`	`52`	`endif()`

Comments

(0)