From a4b305a27d74937ba5b9feec0ed5e1005af1a63b Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 28 Dec 2017 19:22:40 -0800 Subject: Reworked the way File2String utility is used --- Utilities/File2Include/CMakeLists.txt | 46 +++++++++++++-------- Utilities/File2Include/File2String.exe | Bin 89600 -> 0 bytes Utilities/File2Include/bin/Win32/File2String.exe | Bin 109056 -> 0 bytes .../File2Include/bin/Win32/x32/File2String.exe | Bin 0 -> 109056 bytes .../File2Include/bin/Win32/x64/File2String.exe | Bin 0 -> 127488 bytes 5 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 Utilities/File2Include/File2String.exe delete mode 100644 Utilities/File2Include/bin/Win32/File2String.exe create mode 100644 Utilities/File2Include/bin/Win32/x32/File2String.exe create mode 100644 Utilities/File2Include/bin/Win32/x64/File2String.exe (limited to 'Utilities/File2Include') diff --git a/Utilities/File2Include/CMakeLists.txt b/Utilities/File2Include/CMakeLists.txt index 507dd584..ba99e8d3 100644 --- a/Utilities/File2Include/CMakeLists.txt +++ b/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 "$<$:${MSVC_DBG_COMPILE_OPTIONS}>") - target_compile_options(File2String PRIVATE "$<$:${MSVC_REL_COMPILE_OPTIONS}>") - target_compile_options(File2String PRIVATE "$<$:${MSVC_REL_COMPILE_OPTIONS}>") - target_compile_options(File2String PRIVATE "$<$:${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 "$<$:${MSVC_DBG_COMPILE_OPTIONS}>") + target_compile_options(File2String PRIVATE "$<$:${MSVC_REL_COMPILE_OPTIONS}>") + target_compile_options(File2String PRIVATE "$<$:${MSVC_REL_COMPILE_OPTIONS}>") + target_compile_options(File2String PRIVATE "$<$:${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() diff --git a/Utilities/File2Include/File2String.exe b/Utilities/File2Include/File2String.exe deleted file mode 100644 index 76d799d2..00000000 Binary files a/Utilities/File2Include/File2String.exe and /dev/null differ diff --git a/Utilities/File2Include/bin/Win32/File2String.exe b/Utilities/File2Include/bin/Win32/File2String.exe deleted file mode 100644 index 617245e7..00000000 Binary files a/Utilities/File2Include/bin/Win32/File2String.exe and /dev/null differ diff --git a/Utilities/File2Include/bin/Win32/x32/File2String.exe b/Utilities/File2Include/bin/Win32/x32/File2String.exe new file mode 100644 index 00000000..d43a71cf Binary files /dev/null and b/Utilities/File2Include/bin/Win32/x32/File2String.exe differ diff --git a/Utilities/File2Include/bin/Win32/x64/File2String.exe b/Utilities/File2Include/bin/Win32/x64/File2String.exe new file mode 100644 index 00000000..13f223da Binary files /dev/null and b/Utilities/File2Include/bin/Win32/x64/File2String.exe differ -- cgit v1.2.3