Reworked the way File2String utility is used

Author: TheMostDiligent

CMakeLists.txt

@@ -119,10 +119,7 @@ endif()
 
 include(BuildUtils.cmake)
 
-if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS)
-	add_subdirectory(Utilities)
-endif()
-
+add_subdirectory(Utilities)
 add_subdirectory(Primitives)
 add_subdirectory(Platforms)
 add_subdirectory(External)

Graphics/GraphicsEngineD3DBase/CMakeLists.txt

@@ -36,14 +36,6 @@ SOURCES
 	include/HLSLDefinitions.fxh
 )
 
-if(PLATFORM_UNIVERSAL_WINDOWS)
-	# On Universal Windows Platform, we cannot build File2String utility and will use prebuilt Win32 version
-	set(FILE2STRING_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../Utilities/File2Include/bin/Win32/File2String.exe")
-else()
-	add_dependencies(ProcessHLSLDefinitions File2String)
-	set(FILE2STRING_PATH $<TARGET_FILE:File2String>)
-endif()
-
 add_custom_command(TARGET ProcessHLSLDefinitions 
 				   # Unfortunately it is not possible to set TARGET directly to GraphicsEngineD3DBase
 				   # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators 

Graphics/HLSL2GLSLConverterLib/CMakeLists.txt

@@ -43,21 +43,13 @@ PUBLIC
 	GraphicsEngineInterface
 )
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+if(NOT FILE2STRING_PATH STREQUAL "")
 	# Create custom target to convert GLSLDefinitions.h to GLSLDefinitions_inc.h
 	add_custom_target(ProcessGLSLDefinitions 
 	SOURCES
 		include/GLSLDefinitions.h
 	)
 
-	if(PLATFORM_WIN32)
-		set(FILE2STRING_PATH $<TARGET_FILE:File2String>)
-		add_dependencies(ProcessGLSLDefinitions File2String)	
-	else()
-		# We cannot build File2String utility and will use prebuilt Win32 version
-		set(FILE2STRING_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../Utilities/File2Include/bin/Win32/File2String.exe")
-	endif()
-
 	add_custom_command(TARGET ProcessGLSLDefinitions 
 					   # Unfortunately it is not possible to set TARGET directly to HLSL2GLSLConverterLib
 					   # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators 
@@ -72,6 +64,8 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
 	set_target_properties(ProcessGLSLDefinitions PROPERTIES
 		FOLDER Core/Graphics/Helper
 	)
+else()
+	message(WARNING "File2String utility is currently unavailable on this host system. This is not an issues unless you modify GLSLDefinitions.h file")
 endif()
 
 source_group("src" FILES ${SOURCE})

Utilities/CMakeLists.txt

@@ -1,5 +1,3 @@
 cmake_minimum_required (VERSION 3.3)
 
-if(PLATFORM_WIN32)
-	add_subdirectory(File2Include)
-endif()
+add_subdirectory(File2Include)

Utilities/File2Include/CMakeLists.txt

@@ -1,25 +1,37 @@
 cmake_minimum_required (VERSION 3.10)
 
-project(File2Include)
+if(PLATFORM_WIN32)
+	project(File2Include)
 
-set(SOURCE 
-	File2String.cpp
-)
+	set(SOURCE 
+		File2String.cpp
+	)
 
-add_executable(File2String ${SOURCE})
+	add_executable(File2String ${SOURCE})
 
-if(PLATFORM_WIN32)
-	if(MSVC)
-		set(MSVC_DBG_COMPILE_OPTIONS /MTd)
-		set(MSVC_REL_COMPILE_OPTIONS /MT)
-		target_compile_options(File2String PRIVATE "$<$<CONFIG:DEBUG>:${MSVC_DBG_COMPILE_OPTIONS}>")
-		target_compile_options(File2String PRIVATE "$<$<CONFIG:RELEASE>:${MSVC_REL_COMPILE_OPTIONS}>")
-		target_compile_options(File2String PRIVATE "$<$<CONFIG:MINSIZEREL>:${MSVC_REL_COMPILE_OPTIONS}>")
-		target_compile_options(File2String PRIVATE "$<$<CONFIG:RELWITHDEBINFO>:${MSVC_REL_COMPILE_OPTIONS}>")
+	if(PLATFORM_WIN32)
+		if(MSVC)
+			set(MSVC_DBG_COMPILE_OPTIONS /MTd)
+			set(MSVC_REL_COMPILE_OPTIONS /MT)
+			target_compile_options(File2String PRIVATE "$<$<CONFIG:DEBUG>:${MSVC_DBG_COMPILE_OPTIONS}>")
+			target_compile_options(File2String PRIVATE "$<$<CONFIG:RELEASE>:${MSVC_REL_COMPILE_OPTIONS}>")
+			target_compile_options(File2String PRIVATE "$<$<CONFIG:MINSIZEREL>:${MSVC_REL_COMPILE_OPTIONS}>")
+			target_compile_options(File2String PRIVATE "$<$<CONFIG:RELWITHDEBINFO>:${MSVC_REL_COMPILE_OPTIONS}>")
+		endif()
+		set_target_properties(File2String PROPERTIES 
+			RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/bin/Win32/x${ARCH}"
+		)
 	endif()
+	source_group("source" FILES ${SOURCE})
+
+	set_target_properties(File2String PROPERTIES
+		FOLDER Utilities
+	)
 endif()
-source_group("source" FILES ${SOURCE})
 
-set_target_properties(File2String PROPERTIES
-	FOLDER Utilities
-)
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+	# Use prebuilt 32-bit version
+	set(FILE2STRING_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin/Win32/x32/File2String.exe" CACHE INTERNAL "File2String utility")
+else()
+	set(FILE2STRING_PATH "" CACHE INTERNAL "File2String utility unavailable on this host system")
+endif()