[Scummvm-git-logs] scummvm master -> f7e7d6e3f5ce9268eb5a02c8310ac7d719590846

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
37fde9109c CREATE_PROJECT: Explcitly add C++11 support globally
f7e7d6e3f5 CREATE_PROJECT: Explicitly add /opt/local/lib to support MacPorts


Commit: 37fde9109c8a096c966c09862a605275578497ba
    https://github.com/scummvm/scummvm/commit/37fde9109c8a096c966c09862a605275578497ba
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2023-11-05T22:12:55+01:00

Commit Message:
CREATE_PROJECT: Explcitly add C++11 support globally

We have C++11 features in use outside engines as well now.

Changed paths:
    devtools/create_project/cmake.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 9929d1fc80d..74224567011 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -85,6 +85,8 @@ void CMakeProvider::createWorkspace(const BuildSetup &setup) {
 	workspace << "project(" << setup.projectDescription << ")\n\n";
 
 	workspace << R"(set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 11) # Globally enable C++11
+
 find_package(PkgConfig QUIET)
 include(CMakeParseArguments)
 


Commit: f7e7d6e3f5ce9268eb5a02c8310ac7d719590846
    https://github.com/scummvm/scummvm/commit/f7e7d6e3f5ce9268eb5a02c8310ac7d719590846
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2023-11-05T22:12:55+01:00

Commit Message:
CREATE_PROJECT: Explicitly add /opt/local/lib to support MacPorts

This should hopefully be fairly harmless for other platforms,
as well as for Homebrew-users. But it doesn't seem like CMake
adds /opt/local/lib to it's linking setup by default.

Changed paths:
    devtools/create_project/cmake.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 74224567011..e33cab8499b 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -176,6 +176,9 @@ if (TARGET SDL2::SDL2)
 endif()
 include_directories(${SDL2_INCLUDE_DIRS})
 
+# Explicitly support MacPorts (hopefully harmless on other platforms)
+link_directories(/opt/local/lib)
+
 )";
 
 	for (const Feature &feature : setup.features) {