mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 02:29:00 +08:00
8ccb84df72
* [scripts] update Boost ports generation script, fixes #35187 * [boost] remove obsolete patches and re-generate ports * update versions * [boost] remove redundant vcpkg_minimum_required * update versions * [scripts/boost] update dependencies to config/checks, review b2-options.cmake files * [boost-*] regenerate ports * [boost-locale] fix patch * update versions * [boost-serialization] fix checks * update version * [boost-*] better fixes related to the config checks * update version * [boost-cobalt] fix build * update versions * [liblas] Boost v1.84.0 requires C++11 * [pcl] fix Unix build * add versions * [vcpkg-cmake-get-vars] add CMAKE_<LANG>_COMPILER_VERSION * [boost-cobalt] detect compiler * [coin] force C++11 * [json5-parser] force C++11 * add versions * [boost-cobalt] exclude iOS and Android platforms due to C++ Concepts library is not supported * [gtsam] force C++11 * [kenlm] force C++11 * [quickfast] force C++11 * [liblas] force C++11 * update versions * [boost] re-generate port * update version * [kenlm] revert changes * [boost-cobalt] exclude OSX * update versions * [plc] remove useless patch after merge * update versions after merge --------- Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9732bcb..5af9ac2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -66,6 +66,8 @@ set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not libLAS should do ru
|
|
###############################################################################
|
|
# CMake settings
|
|
|
|
+set(CMAKE_CXX_STANDARD 11) # Boost v1.84.0 libraries require C++11
|
|
+
|
|
set(CMAKE_COLOR_MAKEFILE ON)
|
|
|
|
# Allow advanced users to generate Makefiles printing detailed commands
|
|
@@ -149,12 +151,7 @@ else()
|
|
" -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
-
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
|
|
- if (CMAKE_COMPILER_IS_GNUCXX)
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
|
|
- endif()
|
|
-
|
|
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
|
|
endif()
|
|
|