Fastbuild is a multiconfig generator, tell so to CMake.

Also added MinSizeRel and RelWithDebInfo configurations. Also make sure that no default configuration is passed in CMAKE_BUILD_TYPE.
inbilla · Nov 10, 2015 · d335ec0 · d335ec0
1 parent e31dd68
commit d335ec0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake
@@ -67,6 +67,11 @@ if(CMAKE_GENERATOR MATCHES "Ninja")
   mark_as_advanced(CMAKE_EXPORT_COMPILE_COMMANDS)
 endif()
 
+
+if(CMAKE_GENERATOR MATCHES "Fastbuild")
+  set(CMAKE_NO_BUILD_TYPE 1)
+endif()
+
 # GetDefaultWindowsPrefixBase
 #
 # Compute the base directory for CMAKE_INSTALL_PREFIX based on:

diff --git a/Source/cmGlobalFastbuildGenerator.cxx b/Source/cmGlobalFastbuildGenerator.cxx
@@ -364,6 +364,8 @@ class cmGlobalFastbuildGenerator::Detail::Detection
 		{
 			configurations.push_back("Debug");
 			configurations.push_back("Release");
+			configurations.push_back("MinSizeRel");
+			configurations.push_back("RelWithDebInfo");
 		}
 
 		// Reset the entry to have a semi-colon separated list.

diff --git a/Source/cmGlobalFastbuildGenerator.h b/Source/cmGlobalFastbuildGenerator.h
@@ -46,6 +46,8 @@ class cmGlobalFastbuildGenerator
 	virtual cmLocalGenerator *CreateLocalGenerator();
 	virtual std::string GetName() const;
 
+	virtual bool IsMultiConfig() { return true; }
+
 	virtual void AppendDirectoryForConfig(
 		const std::string& prefix,
 		const std::string& config,