switch to the generated MyGUI_Config.h to propagate defines to non-CMake users

Author: Altren

ChangeLog.md

@@ -37,6 +37,7 @@
 - Add Ogre builds
 - Fix build with fetched msdfgen on Windows
 - Fix wrapper build with CMake
+- Generate a public MyGUI_Config.h with the build options as defines, so non-CMake users get the correct settings (MYGUI_STATIC, MYGUI_USE_FREETYPE, MYGUI_MSDF_FONTS, MYGUI_DONT_USE_OBSOLETE)
 
 ## MyGUI v3.5.0
 

MyGUIEngine/CMakeLists.txt

@@ -4,19 +4,27 @@ project(${PROJECTNAME})
 
 include(${PROJECTNAME}.list)
 
+# Generate MyGUI_Config.h from template so non-CMake users have the correct defines
+set(MYGUI_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
+set(MYGUI_STATIC OFF)
+if(NOT BUILD_SHARED_LIBS)
+	set(MYGUI_STATIC ON)
+endif()
+configure_file(
+	"${CMAKE_CURRENT_SOURCE_DIR}/include/MyGUI_Config.h.in"
+	"${MYGUI_CONFIG_DIR}/MyGUI_Config.h"
+	@ONLY
+)
+
 add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
 
 target_include_directories(${PROJECTNAME} PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+	$<BUILD_INTERFACE:${MYGUI_CONFIG_DIR}>
 	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/MYGUI>
 )
 
 target_compile_definitions(${PROJECTNAME}
-	PUBLIC
-		$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:MYGUI_STATIC>
-		$<$<BOOL:${MYGUI_DONT_USE_OBSOLETE}>:MYGUI_DONT_USE_OBSOLETE>
-		$<$<BOOL:${MYGUI_USE_FREETYPE}>:MYGUI_USE_FREETYPE>
-		$<$<BOOL:${MYGUI_MSDF_FONTS}>:MYGUI_MSDF_FONTS>
 	PRIVATE
 		MYGUI_BUILD
 )
@@ -47,7 +55,12 @@ mygui_install_target(${PROJECTNAME})
 
 # install MyGUIEngine headers
 install(FILES ${HEADER_FILES}
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
+)
+
+# install generated configuration header
+install(FILES "${MYGUI_CONFIG_DIR}/MyGUI_Config.h"
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
 )
 
 set_target_properties(MyGUIEngine PROPERTIES EXPORT_NAME MyGUI)

MyGUIEngine/include/MyGUI_Config.h.in

@@ -0,0 +1,34 @@
+/*
+ * This source file is part of MyGUI. For the latest info, see http://mygui.info/
+ * Distributed under the MIT License
+ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT)
+ *
+ * THIS IS A GENERATED FILE. DO NOT EDIT.
+ * Generated by CMake from MyGUI_Config.h.in. The defines below reflect the
+ * options used when building this copy of MyGUIEngine.
+ */
+
+#ifndef MYGUI_CONFIG_H_
+#define MYGUI_CONFIG_H_
+
+// MYGUI_STATIC:
+//   Define when building or using MyGUIEngine as a static library.
+//   Disables dllimport/dllexport / visibility attributes.
+#cmakedefine MYGUI_STATIC
+
+// MYGUI_DONT_USE_OBSOLETE:
+//   When defined, deprecated APIs are excluded from the library.
+//   Otherwise those are [[deprecated]]
+#cmakedefine MYGUI_DONT_USE_OBSOLETE
+
+// MYGUI_USE_FREETYPE:
+//   When defined, TrueType font support via FreeType is enabled.
+//   Requires linking against Freetype.
+#cmakedefine MYGUI_USE_FREETYPE
+
+// MYGUI_MSDF_FONTS:
+//   When defined, Multi-channel Signed Distance Field font rendering is enabled.
+//   Implies MYGUI_USE_FREETYPE. Requires msdfgen linkage.
+#cmakedefine MYGUI_MSDF_FONTS
+
+#endif // MYGUI_CONFIG_H_

MyGUIEngine/include/MyGUI_Prerequest.h

@@ -7,6 +7,7 @@
 #ifndef MYGUI_PREREQUEST_H_
 #define MYGUI_PREREQUEST_H_
 
+#include "MyGUI_Config.h"
 #include "MyGUI_Platform.h"
 
 #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)