File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ for /f "tokens=4 delims=\" %%a in ("%VCINSTALLDIR%") do (
5050for /f " tokens=1 delims=." %%a in (" %VisualStudioVersion% " ) do (
5151 SET visual_studio_major_version = %%a
5252)
53- cmake -DABSL_MSVC_STATIC_RUNTIME=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=%cd% \protobuf-%PROTOBUF_VER% -DCMAKE_PREFIX_PATH=%cd% \protobuf-%PROTOBUF_VER% -G " Visual Studio %visual_studio_major_version% %VC_YEAR% " %CMAKE_VSARCH% .. || exit /b 1
53+ cmake -DCMAKE_CXX_STANDARD= 17 - DABSL_MSVC_STATIC_RUNTIME=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=%cd% \protobuf-%PROTOBUF_VER% -DCMAKE_PREFIX_PATH=%cd% \protobuf-%PROTOBUF_VER% -G " Visual Studio %visual_studio_major_version% %VC_YEAR% " %CMAKE_VSARCH% .. || exit /b 1
5454cmake --build . --config Release --target install || exit /b 1
5555popd
5656goto :eof
Original file line number Diff line number Diff line change 4242 # install here so we don't need sudo
4343 if [[ " $( uname -s) " == " Darwin" ]]; then
4444 cmake .. \
45- -DCMAKE_CXX_STANDARD=14 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
45+ -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
4646 -DCMAKE_INSTALL_PREFIX=" $INSTALL_DIR " -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
4747 -DCMAKE_OSX_ARCHITECTURES=" arm64;x86_64" \
4848 -B. || exit 1
4949 elif [[ " $ARCH " == x86* ]]; then
5050 CFLAGS=-m${ARCH#* _} CXXFLAGS=-m${ARCH#* _} cmake .. \
51- -DCMAKE_CXX_STANDARD=14 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
51+ -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
5252 -DCMAKE_INSTALL_PREFIX=" $INSTALL_DIR " -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
5353 -B. || exit 1
5454 else
6565 exit 1
6666 fi
6767 cmake .. \
68- -DCMAKE_CXX_STANDARD=14 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
68+ -DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF \
6969 -DCMAKE_INSTALL_PREFIX=" $INSTALL_DIR " -DABSL_INTERNAL_AT_LEAST_CXX17=0 \
7070 -Dcrosscompile_ARCH=" $GCC_ARCH " \
7171 -DCMAKE_TOOLCHAIN_FILE=$BUILDSCRIPTS_DIR /toolchain.cmake \
You can’t perform that action at this time.
0 commit comments