diff options
Diffstat (limited to 'devtools/create_project/cmake.cpp')
| -rw-r--r-- | devtools/create_project/cmake.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp index 9be76f9fe8..d1a2be86cc 100644 --- a/devtools/create_project/cmake.cpp +++ b/devtools/create_project/cmake.cpp @@ -37,7 +37,7 @@ CMakeProvider::CMakeProvider(StringList &global_warnings, std::map<std::string, const CMakeProvider::Library *CMakeProvider::getLibraryFromFeature(const char *feature, bool useSDL2) const { static const Library s_libraries[] = { { "sdl", kSDLVersion1, "FindSDL", "SDL", "SDL_INCLUDE_DIR", "SDL_LIBRARY", 0 }, - { "sdl", kSDLVersion2, 0, "SDL2", "SDL2_INCLUDE_DIRS", "SDL2_LIBRARIES", 0 }, + { "sdl", kSDLVersion2, 0, "SDL2", 0, "SDL2_LIBRARIES", 0 }, { "freetype", kSDLVersionAny, "FindFreetype", "Freetype", "FREETYPE_INCLUDE_DIRS", "FREETYPE_LIBRARIES", 0 }, { "libz", kSDLVersionAny, "FindZLIB", "ZLIB", "ZLIB_INCLUDE_DIRS", "ZLIB_LIBRARIES", 0 }, { "png", kSDLVersionAny, "FindPNG", "PNG", "PNG_INCLUDE_DIRS", "PNG_LIBRARIES", 0 }, @@ -84,8 +84,17 @@ void CMakeProvider::createWorkspace(const BuildSetup &setup) { workspace << "include_directories(${" << setup.projectDescription << "_SOURCE_DIR} ${" << setup.projectDescription << "_SOURCE_DIR}/engines " "$ENV{"<<LIBS_DEFINE<<"}/include .)\n\n"; - workspace << "# Libraries and features\n"; + workspace << "# Libraries and features\n\n"; writeFeatureLibSearch(setup, workspace, "sdl"); + + workspace << "# Depending on how SDL2 was built, there can be either and imported target or flags variables\n"; + workspace << "# Define the flags variables from the imported target if necessary\n"; + workspace << "if (TARGET SDL2::SDL2)\n"; + workspace << " get_target_property(SDL2_INCLUDE_DIRS SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)\n"; + workspace << " get_target_property(SDL2_LIBRARIES SDL2::SDL2 LOCATION)\n"; + workspace << "endif()\n"; + workspace << "include_directories(${SDL2_INCLUDE_DIRS})\n\n"; + for (FeatureList::const_iterator i = setup.features.begin(), end = setup.features.end(); i != end; ++i) { if (!i->enable || featureExcluded(i->name)) continue; @@ -191,13 +200,16 @@ void CMakeProvider::createProjectFile(const std::string &name, const std::string addFilesToProject(moduleDir, project, includeList, excludeList, setup.filePrefix); - project << ")\n"; + project << ")\n\n"; if (name != setup.projectName) { project << "endif()\n"; } - project << "# Libraries\n"; if (name == setup.projectName) { + project << "# Engines libraries handling\n"; + writeEnginesLibrariesHandling(setup, project); + + project << "# Libraries\n"; const Library *sdlLibrary = getLibraryFromFeature("sdl", setup.useSDL2); project << "target_link_libraries(" << name << " ${" << sdlLibrary->librariesVar << "})\n"; @@ -219,9 +231,6 @@ void CMakeProvider::createProjectFile(const std::string &name, const std::string project << "endif()\n"; project << "\n"; - project << "# Engines libraries handling\n"; - writeEnginesLibrariesHandling(setup, project); - project << "set_property(TARGET " << name << " PROPERTY CXX_STANDARD 11)\n"; project << "set_property(TARGET " << name << " PROPERTY CXX_STANDARD_REQUIRED ON)\n"; } |