[Scummvm-git-logs] scummvm master -> 90299eb73e3a4336db1d15a7cb7de0dba6eb73a4

sev- sev at scummvm.org
Sat Aug 11 08:22:06 CEST 2018


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

Summary:
90299eb73e CREATE_PROJECT: Fix creating CMake projects outside of the main source directory


Commit: 90299eb73e3a4336db1d15a7cb7de0dba6eb73a4
    https://github.com/scummvm/scummvm/commit/90299eb73e3a4336db1d15a7cb7de0dba6eb73a4
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-11T08:22:03+02:00

Commit Message:
CREATE_PROJECT: Fix creating CMake projects outside of the main source directory

Changed paths:
    devtools/create_project/cmake.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index d1a2be8..20f8682 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -81,7 +81,7 @@ void CMakeProvider::createWorkspace(const BuildSetup &setup) {
 	workspace << "# Generate options for the engines\n";
 	writeEngineOptions(workspace);
 
-	workspace << "include_directories(${" << setup.projectDescription << "_SOURCE_DIR} ${" << setup.projectDescription << "_SOURCE_DIR}/engines "
+	workspace << "include_directories(${" << setup.projectDescription << "_SOURCE_DIR}/" <<  setup.filePrefix << " ${" << setup.projectDescription << "_SOURCE_DIR}/" <<  setup.filePrefix << "/engines "
 			"$ENV{"<<LIBS_DEFINE<<"}/include .)\n\n";
 
 	workspace << "# Libraries and features\n\n";





More information about the Scummvm-git-logs mailing list