diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-02-17 23:31:09 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-02-17 23:31:09 -0800 |
| commit | 4f4f09e0d7b4ede4d49c71e2e7d7147e7353a08a (patch) | |
| tree | b27880164f81e69f1292f0358ce50229bc9249e0 /cmake | |
| parent | 1480f903fd19ee8924f88f1e5104bc12f126f9ef (diff) | |
| parent | e7408114fe12ec90b00978ba1d6e07e7c48275a1 (diff) | |
| download | tink-4f4f09e0d7b4ede4d49c71e2e7d7147e7353a08a.tar.gz | |
Merge pull request #520 from carloscbl:master
PiperOrigin-RevId: 429489691
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/TinkBuildRules.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/TinkBuildRules.cmake b/cmake/TinkBuildRules.cmake index f2cdef140..2a6ef1fbb 100644 --- a/cmake/TinkBuildRules.cmake +++ b/cmake/TinkBuildRules.cmake @@ -43,7 +43,10 @@ if (NOT DEFINED TINK_GENFILE_DIR) endif() if (NOT DEFINED TINK_CXX_STANDARD) - set(TINK_CXX_STANDARD 11) + set(TINK_CXX_STANDARD 11) + if (DEFINED CMAKE_CXX_STANDARD_REQUIRED AND CMAKE_CXX_STANDARD_REQUIRED AND DEFINED CMAKE_CXX_STANDARD) + set(TINK_CXX_STANDARD ${CMAKE_CXX_STANDARD}) + endif() endif() list(APPEND TINK_INCLUDE_DIRS "${TINK_GENFILE_DIR}") |