[Scummvm-git-logs] scummvm master -> 64c2072ce2ea8e6a9443a5718220b77351318e1b

[bluegr]

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

Summary:
64c2072ce2 CREATE_PROJECT: Fix include order for cmake projects


Commit: 64c2072ce2ea8e6a9443a5718220b77351318e1b
    https://github.com/scummvm/scummvm/commit/64c2072ce2ea8e6a9443a5718220b77351318e1b
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2025-04-25T20:33:19+03:00

Commit Message:
CREATE_PROJECT: Fix include order for cmake projects

If the engines directory contains plugins_table.h or detection_table.h
from an in-source build, when building out-of-source, these files from
the source directory were prioritized over build directory versions.

This caused issues when different plugins were enabled across builds.

The revised include order now matches the implementation in Makefile.

Changed paths:
    devtools/create_project/cmake.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 4dd43dfe9d0..517d97db01f 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -165,8 +165,10 @@ endfunction()
 	for (const std::string &includeDir : setup.includeDirs)
 		includeDirsList += includeDir + ' ';
 
-	workspace << "include_directories(${" << setup.projectDescription << "_SOURCE_DIR}/" <<  setup.filePrefix << " ${" << setup.projectDescription << "_SOURCE_DIR}/" <<  setup.filePrefix << "/engines "
-			  << includeDirsList << "$ENV{"<<LIBS_DEFINE<<"}/include .)\n\n";
+	workspace << "include_directories(. ${"
+			  << setup.projectDescription << "_SOURCE_DIR}/" <<  setup.filePrefix
+			  << " ${" << setup.projectDescription << "_SOURCE_DIR}/" <<  setup.filePrefix << "/engines "
+			  << includeDirsList << "$ENV{"<<LIBS_DEFINE<<"}/include)\n\n";
 
 	workspace << "# Libraries and features\n\n";
 	writeFeatureLibSearch(setup, workspace, "sdl");