git: 4b0e25639b72 - main - graphics/blender-lts28: prepare for cmake-3.22
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Dec 2021 09:09:10 UTC
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b0e25639b7290d5009ebfda073bb2364da9172f commit 4b0e25639b7290d5009ebfda073bb2364da9172f Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-12-11 09:04:27 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-12-11 09:05:17 +0000 graphics/blender-lts28: prepare for cmake-3.22 PR: 260123 --- graphics/blender-lts28/files/patch-CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/graphics/blender-lts28/files/patch-CMakeLists.txt b/graphics/blender-lts28/files/patch-CMakeLists.txt index ee48fd245d84..f138a4bee9da 100644 --- a/graphics/blender-lts28/files/patch-CMakeLists.txt +++ b/graphics/blender-lts28/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-07-31 13:12:04 UTC +--- CMakeLists.txt.orig 2021-02-23 09:13:59 UTC +++ CMakeLists.txt -@@ -647,11 +647,6 @@ if(NOT WITH_PYTHON) +@@ -613,11 +613,6 @@ if(NOT WITH_PYTHON) set(WITH_DRACO OFF) endif() @@ -11,4 +11,13 @@ - # enable boost for cycles, audaspace or i18n # otherwise if the user disabled - if(NOT WITH_BOOST) + +@@ -1552,7 +1547,7 @@ elseif( + CMAKE_C_COMPILER_ID MATCHES "Intel" + ) + # TODO(sergey): Do we want c++11 or gnu-c++11 here? +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + else() + message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build") + endif()