[Scummvm-git-logs] scummvm master -> 6bb953e25bca80f763f8cd7c2df1863a529ba889

[peterkohaut]

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:
6bb953e25b CREATE_PROJECT: Support for a different target build directory in CMake


Commit: 6bb953e25bca80f763f8cd7c2df1863a529ba889
    https://github.com/scummvm/scummvm/commit/6bb953e25bca80f763f8cd7c2df1863a529ba889
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-03-10T00:21:14+01:00

Commit Message:
CREATE_PROJECT: Support for a different target build directory in CMake

Changed paths:
    devtools/create_project/cmake.cpp


diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 541e79e..b6dca11 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -81,8 +81,8 @@ 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\n"
-			"$ENV{"<<LIBS_DEFINE<<"}/include)\n\n";
+	workspace << "include_directories(${" << setup.projectDescription << "_SOURCE_DIR} ${" << setup.projectDescription << "_SOURCE_DIR}/engines "
+			"$ENV{"<<LIBS_DEFINE<<"}/include .)\n\n";
 
 	workspace << "# Libraries and features\n";
 	writeFeatureLibSearch(setup, workspace, "sdl");
@@ -214,7 +214,7 @@ void CMakeProvider::createProjectFile(const std::string &name, const std::string
 			}
 		}
 		project << "if (WIN32)\n";
-		project << "    target_sources(" << name << " PUBLIC dists/" << name << ".rc)\n";
+		project << "    target_sources(" << name << " PUBLIC " << setup.filePrefix << "/dists/" << name << ".rc)\n";
 		project << "    target_link_libraries(" << name << " winmm)\n";
 		project << "endif()\n";
 		project << "\n";