Jul 15, 2013 · Jul 13, 2013
diff --git a/CMakeLists.txt b/CMakeLists.txt
 option( CPP-NETLIB_DISABLE_LOGGING "Disable logging definitely, no logging code will be generated or compiled." OFF )
 option( CPP-NETLIB_DISABLE_LIBCXX "Disable using libc++ when compiling with clang." OFF )


 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 find_package( ICU )

  add_definitions(-DNETWORK_DEBUG)
 endif()



 if (OPENSSL_FOUND)
  add_definitions(-DNETWORK_ENABLE_HTTPS)
 endif()
  INCLUDE(CheckCXXCompilerFlag)
  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
  if (HAVE_STD11)
    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}"-std=c++11 -Wall")
    set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
  else()
    message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
  endif()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,7 +15,6 @@ option( CPP-NETLIB_ALWAYS_LOGGING "Allow cpp-netlib to log debug messages even i
		option( CPP-NETLIB_DISABLE_LOGGING "Disable logging definitely, no logging code will be generated or compiled." OFF )
		option( CPP-NETLIB_DISABLE_LIBCXX "Disable using libc++ when compiling with clang." OFF )


		set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
		find_package( ICU )

Expand All		@@ -39,8 +38,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
		add_definitions(-DNETWORK_DEBUG)
		endif()



		if (OPENSSL_FOUND)
		add_definitions(-DNETWORK_ENABLE_HTTPS)
		endif()
Expand All		@@ -49,7 +46,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
		INCLUDE(CheckCXXCompilerFlag)
		CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
		if (HAVE_STD11)
		set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}"-std=c++11 -Wall")
		set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
		else()
		message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
		endif()
Expand Down