diff options
| author | Peter Kohaut | 2017-03-10 00:21:14 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2017-03-10 00:21:14 +0100 |
| commit | 6bb953e25bca80f763f8cd7c2df1863a529ba889 (patch) | |
| tree | d42494358604033c143f0ef73981f3f7b9f12310 /devtools | |
| parent | 652c29914bdced76cf3c3476fedacdef0d355e1c (diff) | |
| download | scummvm-rg350-6bb953e25bca80f763f8cd7c2df1863a529ba889.tar.gz scummvm-rg350-6bb953e25bca80f763f8cd7c2df1863a529ba889.tar.bz2 scummvm-rg350-6bb953e25bca80f763f8cd7c2df1863a529ba889.zip | |
CREATE_PROJECT: Support for a different target build directory in CMake
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/create_project/cmake.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp index 541e79efab..b6dca11c63 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"; |