Skip to content

Commit

Permalink
Merge pull request #14 from rleigh-codelibre/XERCESC-2141_build_suppo…
Browse files Browse the repository at this point in the history
…rt_for_c++11_onwards

XERCESC-2141: Enable C++17, C++14 or C++11 when available
  • Loading branch information
rleigh-codelibre committed Jun 3, 2020
2 parents b73d4a9 + 6883e34 commit 26db0a1
Show file tree
Hide file tree
Showing 3 changed files with 993 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -32,9 +32,9 @@ if (POLICY CMP0067)
cmake_policy(SET CMP0067 NEW)
endif(POLICY CMP0067)

# Try C++14, then fall back to C++11 and C++98. Used for feature tests
# Try C++17, then fall back to C++14, C++11 then C++98. Used for feature tests
# for optional features.
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)

# Use folders (for IDE project grouping)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
Expand Down
9 changes: 9 additions & 0 deletions configure.ac
Expand Up @@ -79,6 +79,15 @@ AM_SILENT_RULES([yes])
AM_INIT_AUTOMAKE([foreign subdir-objects dist-bzip2 tar-ustar])
AM_MAINTAINER_MODE

# Checks for C++ standard version
AX_CXX_COMPILE_STDCXX([17], [ext], [optional])
if test "$HAVE_CXX17" = "0"; then
AX_CXX_COMPILE_STDCXX([14], [ext], [optional])
if test "$HAVE_CXX14" = "0"; then
AX_CXX_COMPILE_STDCXX([11], [ext], [optional])
fi
fi

# Check if rpath is disabled
AC_MSG_CHECKING(whether to use rpath)
AC_ARG_ENABLE(rpath,
Expand Down

0 comments on commit 26db0a1

Please sign in to comment.