From d1c2c04e3ee11a747e2de3b787be3fd76cfe6f39 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 12 Feb 2018 20:49:39 -0800 Subject: Fixed formatting of cmake files --- External/libjpeg-9a/CMakeLists.txt | 128 ++++++++++++++-------------- External/libtiff-4.0.3/CMakeLists.txt | 156 +++++++++++++++++----------------- External/lpng-1.6.17/CMakeLists.txt | 58 ++++++------- External/lua-5.2.3/CMakeLists.txt | 142 +++++++++++++++---------------- External/zlib-1.2.8/CMakeLists.txt | 66 +++++++------- HLSL2GLSLConverter/CMakeLists.txt | 22 ++--- RenderScript/CMakeLists.txt | 140 +++++++++++++++--------------- TextureLoader/CMakeLists.txt | 44 +++++----- 8 files changed, 378 insertions(+), 378 deletions(-) diff --git a/External/libjpeg-9a/CMakeLists.txt b/External/libjpeg-9a/CMakeLists.txt index a93bec5..d74585f 100644 --- a/External/libjpeg-9a/CMakeLists.txt +++ b/External/libjpeg-9a/CMakeLists.txt @@ -3,64 +3,64 @@ cmake_minimum_required (VERSION 3.6) project(LibJpeg C) set(SOURCE - jaricom.c - jcapimin.c - jcapistd.c - jcarith.c - jccoefct.c - jccolor.c - jcdctmgr.c - jchuff.c - jcinit.c - jcmainct.c - jcmarker.c - jcmaster.c - jcomapi.c - jcparam.c - jcprepct.c - jcsample.c - jctrans.c - jdapimin.c - jdapistd.c - jdarith.c - jdatadst.c - jdatasrc.c - jdcoefct.c - jdcolor.c - jddctmgr.c - jdhuff.c - jdinput.c - jdmainct.c - jdmarker.c - jdmaster.c - jdmerge.c - jdpostct.c - jdsample.c - jdtrans.c - jerror.c - jfdctflt.c - jfdctfst.c - jfdctint.c - jidctflt.c - jidctfst.c - jidctint.c - jmemmgr.c - jmemnobs.c - jquant1.c - jquant2.c - jutils.c + jaricom.c + jcapimin.c + jcapistd.c + jcarith.c + jccoefct.c + jccolor.c + jcdctmgr.c + jchuff.c + jcinit.c + jcmainct.c + jcmarker.c + jcmaster.c + jcomapi.c + jcparam.c + jcprepct.c + jcsample.c + jctrans.c + jdapimin.c + jdapistd.c + jdarith.c + jdatadst.c + jdatasrc.c + jdcoefct.c + jdcolor.c + jddctmgr.c + jdhuff.c + jdinput.c + jdmainct.c + jdmarker.c + jdmaster.c + jdmerge.c + jdpostct.c + jdsample.c + jdtrans.c + jerror.c + jfdctflt.c + jfdctfst.c + jfdctint.c + jidctflt.c + jidctfst.c + jidctint.c + jmemmgr.c + jmemnobs.c + jquant1.c + jquant2.c + jutils.c ) set(INCLUDE - jconfig.h - jdct.h - jerror.h - jinclude.h - jmemsys.h - jmorecfg.h - jpegint.h - jpeglib.h - jversion.h + jconfig.h + jdct.h + jerror.h + jinclude.h + jmemsys.h + jmorecfg.h + jpegint.h + jpeglib.h + jversion.h ) add_library(LibJpeg STATIC ${SOURCE} ${INCLUDE}) @@ -71,19 +71,19 @@ target_include_directories(LibJpeg PUBLIC .) target_link_libraries(LibJpeg PRIVATE BuildSettings) if(MSVC) - # Disable MSVC-specific warnings - # - w4244: '+=': conversion from 'int' to 'JCOEF', possible loss of data - # - w4127: conditional expression is constant - target_compile_options(LibJpeg PRIVATE /wd4244 /wd4127) - target_compile_definitions(LibJpeg PRIVATE -D_CRT_SECURE_NO_WARNINGS) - if(PLATFORM_UNIVERSAL_WINDOWS) - target_compile_definitions(LibJpeg PRIVATE -DNO_GETENV) - endif() + # Disable MSVC-specific warnings + # - w4244: '+=': conversion from 'int' to 'JCOEF', possible loss of data + # - w4127: conditional expression is constant + target_compile_options(LibJpeg PRIVATE /wd4244 /wd4127) + target_compile_definitions(LibJpeg PRIVATE -D_CRT_SECURE_NO_WARNINGS) + if(PLATFORM_UNIVERSAL_WINDOWS) + target_compile_definitions(LibJpeg PRIVATE -DNO_GETENV) + endif() endif(MSVC) source_group("src" FILES ${SOURCE}) source_group("include" FILES ${INCLUDE}) set_target_properties(LibJpeg PROPERTIES - FOLDER Tools/External + FOLDER Tools/External ) \ No newline at end of file diff --git a/External/libtiff-4.0.3/CMakeLists.txt b/External/libtiff-4.0.3/CMakeLists.txt index 36581af..3832412 100644 --- a/External/libtiff-4.0.3/CMakeLists.txt +++ b/External/libtiff-4.0.3/CMakeLists.txt @@ -4,113 +4,113 @@ project(LibTiff C) set(SOURCE # libtiff/mkg3states.c - libtiff/tif_aux.c - libtiff/tif_close.c - libtiff/tif_codec.c - libtiff/tif_color.c - libtiff/tif_compress.c - libtiff/tif_dir.c - libtiff/tif_dirinfo.c - libtiff/tif_dirread.c - libtiff/tif_dirwrite.c - libtiff/tif_dumpmode.c - libtiff/tif_error.c - libtiff/tif_extension.c - libtiff/tif_fax3.c - libtiff/tif_fax3sm.c - libtiff/tif_flush.c - libtiff/tif_getimage.c - libtiff/tif_jbig.c - libtiff/tif_jpeg.c - libtiff/tif_jpeg_12.c - libtiff/tif_luv.c - libtiff/tif_lzma.c - libtiff/tif_lzw.c - libtiff/tif_next.c - libtiff/tif_ojpeg.c - libtiff/tif_open.c - libtiff/tif_packbits.c - libtiff/tif_pixarlog.c - libtiff/tif_predict.c - libtiff/tif_print.c - libtiff/tif_read.c - libtiff/tif_stream.cxx - libtiff/tif_strip.c - libtiff/tif_swab.c - libtiff/tif_thunder.c - libtiff/tif_tile.c - libtiff/tif_version.c - libtiff/tif_warning.c - libtiff/tif_write.c - libtiff/tif_zip.c + libtiff/tif_aux.c + libtiff/tif_close.c + libtiff/tif_codec.c + libtiff/tif_color.c + libtiff/tif_compress.c + libtiff/tif_dir.c + libtiff/tif_dirinfo.c + libtiff/tif_dirread.c + libtiff/tif_dirwrite.c + libtiff/tif_dumpmode.c + libtiff/tif_error.c + libtiff/tif_extension.c + libtiff/tif_fax3.c + libtiff/tif_fax3sm.c + libtiff/tif_flush.c + libtiff/tif_getimage.c + libtiff/tif_jbig.c + libtiff/tif_jpeg.c + libtiff/tif_jpeg_12.c + libtiff/tif_luv.c + libtiff/tif_lzma.c + libtiff/tif_lzw.c + libtiff/tif_next.c + libtiff/tif_ojpeg.c + libtiff/tif_open.c + libtiff/tif_packbits.c + libtiff/tif_pixarlog.c + libtiff/tif_predict.c + libtiff/tif_print.c + libtiff/tif_read.c + libtiff/tif_stream.cxx + libtiff/tif_strip.c + libtiff/tif_swab.c + libtiff/tif_thunder.c + libtiff/tif_tile.c + libtiff/tif_version.c + libtiff/tif_warning.c + libtiff/tif_write.c + libtiff/tif_zip.c ) if(PLATFORM_WIN32) - list(APPEND SOURCE libtiff/tif_win32.c) + list(APPEND SOURCE libtiff/tif_win32.c) elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS) - list(APPEND SOURCE libtiff/tif_unix.c) + list(APPEND SOURCE libtiff/tif_unix.c) else() - message(FATAL_ERROR "Unknown platform") + message(FATAL_ERROR "Unknown platform") endif() set(INCLUDE - libtiff/t4.h - libtiff/tif_config.android.h - libtiff/tif_config.h - libtiff/tif_config.h-vms - libtiff/tif_config.vc.h - libtiff/tif_config.wince.h - libtiff/tif_dir.h - libtiff/tif_fax3.h - libtiff/tif_predict.h - libtiff/tiff.h - libtiff/tiffconf.linux.h - libtiff/tiffconf.h - libtiff/tiffconf.vc.h - libtiff/tiffconf.wince.h - libtiff/tiffio.h - libtiff/tiffio.hxx - libtiff/tiffiop.h - libtiff/tiffvers.h - libtiff/uvcode.h + libtiff/t4.h + libtiff/tif_config.android.h + libtiff/tif_config.h + libtiff/tif_config.h-vms + libtiff/tif_config.vc.h + libtiff/tif_config.wince.h + libtiff/tif_dir.h + libtiff/tif_fax3.h + libtiff/tif_predict.h + libtiff/tiff.h + libtiff/tiffconf.linux.h + libtiff/tiffconf.h + libtiff/tiffconf.vc.h + libtiff/tiffconf.wince.h + libtiff/tiffio.h + libtiff/tiffio.hxx + libtiff/tiffiop.h + libtiff/tiffvers.h + libtiff/uvcode.h ) add_library(LibTiff STATIC ${SOURCE} ${INCLUDE}) set_common_target_properties(LibTiff) if(MSVC) - # Disable MSVC-specific warnings - target_compile_definitions(LibTiff PRIVATE -D_CRT_SECURE_NO_WARNINGS) - target_compile_options(LibTiff PRIVATE /wd4244 /wd4456 /wd4457 /wd4706) + # Disable MSVC-specific warnings + target_compile_definitions(LibTiff PRIVATE -D_CRT_SECURE_NO_WARNINGS) + target_compile_options(LibTiff PRIVATE /wd4244 /wd4456 /wd4457 /wd4706) - if(PLATFORM_UNIVERSAL_WINDOWS) - target_compile_definitions(LibTiff PRIVATE -D_CRT_NONSTDC_NO_WARNINGS) - target_compile_options(LibTiff PRIVATE /wd4311 /wd4312) - endif() + if(PLATFORM_UNIVERSAL_WINDOWS) + target_compile_definitions(LibTiff PRIVATE -D_CRT_NONSTDC_NO_WARNINGS) + target_compile_options(LibTiff PRIVATE /wd4311 /wd4312) + endif() endif(MSVC) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Suppress the following warnings in tif_unix.c - # cast from pointer to integer of different size [-Wpointer-to-int-cast] - # and - # cast to pointer from integer of different size [-Wint-to-pointer-cast] - set_source_files_properties( - libtiff/tif_unix.c - PROPERTIES - COMPILE_FLAGS "-Wno-pointer-to-int-cast -Wno-int-to-pointer-cast" - ) + # cast from pointer to integer of different size [-Wpointer-to-int-cast] + # and + # cast to pointer from integer of different size [-Wint-to-pointer-cast] + set_source_files_properties( + libtiff/tif_unix.c + PROPERTIES + COMPILE_FLAGS "-Wno-pointer-to-int-cast -Wno-int-to-pointer-cast" + ) endif() target_link_libraries(LibTiff PRIVATE BuildSettings) target_include_directories(LibTiff - PUBLIC libtiff + PUBLIC libtiff ) source_group("src" FILES ${SOURCE}) source_group("include" FILES ${INCLUDE}) set_target_properties(LibTiff PROPERTIES - FOLDER Tools/External + FOLDER Tools/External ) diff --git a/External/lpng-1.6.17/CMakeLists.txt b/External/lpng-1.6.17/CMakeLists.txt index fc04af3..1d2a968 100644 --- a/External/lpng-1.6.17/CMakeLists.txt +++ b/External/lpng-1.6.17/CMakeLists.txt @@ -3,57 +3,57 @@ cmake_minimum_required (VERSION 3.6) project(LibPng C) set(SOURCE - png.c - pngerror.c - pngget.c - pngmem.c - pngpread.c - pngread.c - pngrio.c - pngrtran.c - pngrutil.c - pngset.c - pngtrans.c - pngwio.c - pngwrite.c - pngwtran.c - pngwutil.c + png.c + pngerror.c + pngget.c + pngmem.c + pngpread.c + pngread.c + pngrio.c + pngrtran.c + pngrutil.c + pngset.c + pngtrans.c + pngwio.c + pngwrite.c + pngwtran.c + pngwutil.c ) set(INCLUDE - png.h - pngconf.h - pngdebug.h - pnginfo.h - pngpriv.h - pngstruct.h + png.h + pngconf.h + pngdebug.h + pnginfo.h + pngpriv.h + pngstruct.h ) add_library(LibPng ${SOURCE} ${INCLUDE}) set_common_target_properties(LibPng) if(MSVC) - target_compile_definitions(LibPng PRIVATE -D_CRT_SECURE_NO_WARNINGS) - if(PLATFORM_UNIVERSAL_WINDOWS) - target_compile_definitions(LibPng PRIVATE PNG_ABORT=abort) - endif() + target_compile_definitions(LibPng PRIVATE -D_CRT_SECURE_NO_WARNINGS) + if(PLATFORM_UNIVERSAL_WINDOWS) + target_compile_definitions(LibPng PRIVATE PNG_ABORT=abort) + endif() endif() target_include_directories(LibPng INTERFACE - . + . ) target_link_libraries(LibPng PRIVATE - BuildSettings + BuildSettings PUBLIC - ZLib + ZLib ) source_group("src" FILES ${SOURCE}) source_group("include" FILES ${INCLUDE}) set_target_properties(LibPng PROPERTIES - FOLDER Tools/External + FOLDER Tools/External ) \ No newline at end of file diff --git a/External/lua-5.2.3/CMakeLists.txt b/External/lua-5.2.3/CMakeLists.txt index 6e4ee5c..1696566 100644 --- a/External/lua-5.2.3/CMakeLists.txt +++ b/External/lua-5.2.3/CMakeLists.txt @@ -3,104 +3,104 @@ cmake_minimum_required (VERSION 3.6) project(Lua CXX) set(SOURCE - src/lapi.c - src/lauxlib.c - src/lbaselib.c - src/lbitlib.c - src/lcode.c - src/lcorolib.c - src/lctype.c - src/ldblib.c - src/ldebug.c - src/ldo.c - src/ldump.c - src/lfunc.c - src/lgc.c - src/linit.c - src/liolib.c - src/llex.c - src/lmathlib.c - src/lmem.c - src/loadlib.c - src/lobject.c - src/lopcodes.c - src/loslib.c - src/lparser.c - src/lstate.c - src/lstring.c - src/lstrlib.c - src/ltable.c - src/ltablib.c - src/ltm.c + src/lapi.c + src/lauxlib.c + src/lbaselib.c + src/lbitlib.c + src/lcode.c + src/lcorolib.c + src/lctype.c + src/ldblib.c + src/ldebug.c + src/ldo.c + src/ldump.c + src/lfunc.c + src/lgc.c + src/linit.c + src/liolib.c + src/llex.c + src/lmathlib.c + src/lmem.c + src/loadlib.c + src/lobject.c + src/lopcodes.c + src/loslib.c + src/lparser.c + src/lstate.c + src/lstring.c + src/lstrlib.c + src/ltable.c + src/ltablib.c + src/ltm.c # src/lua.c # src/luac.c - src/lundump.c - src/lvm.c - src/lzio.c + src/lundump.c + src/lvm.c + src/lzio.c ) # We need to compile all source files with c++ compiler set_source_files_properties(${SOURCE} PROPERTIES LANGUAGE CXX) set(INCLUDE - src/lapi.h - src/lauxlib.h - src/lcode.h - src/lctype.h - src/ldebug.h - src/ldo.h - src/lfunc.h - src/lgc.h - src/llex.h - src/llimits.h - src/lmem.h - src/lobject.h - src/lopcodes.h - src/lparser.h - src/lstate.h - src/lstring.h - src/ltable.h - src/ltm.h - src/lua.h - src/lua.hpp - src/luaconf.h - src/lualib.h - src/lundump.h - src/lvm.h - src/lzio.h - src/winappstubs.h + src/lapi.h + src/lauxlib.h + src/lcode.h + src/lctype.h + src/ldebug.h + src/ldo.h + src/lfunc.h + src/lgc.h + src/llex.h + src/llimits.h + src/lmem.h + src/lobject.h + src/lopcodes.h + src/lparser.h + src/lstate.h + src/lstring.h + src/ltable.h + src/ltm.h + src/lua.h + src/lua.hpp + src/luaconf.h + src/lualib.h + src/lundump.h + src/lvm.h + src/lzio.h + src/winappstubs.h ) add_library(Lua STATIC ${SOURCE} ${INCLUDE}) set_common_target_properties(Lua) target_include_directories(Lua PUBLIC - src + src ) target_link_libraries(Lua PRIVATE BuildSettings) if(MSVC) - # Disable MSVC-specific warnings - target_compile_definitions(Lua PRIVATE -D_CRT_SECURE_NO_WARNINGS) - target_compile_options(Lua PRIVATE /W3 /wd4244 /wd4334 /wd4702) + # Disable MSVC-specific warnings + target_compile_definitions(Lua PRIVATE -D_CRT_SECURE_NO_WARNINGS) + target_compile_options(Lua PRIVATE /W3 /wd4244 /wd4334 /wd4702) endif(MSVC) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") - # Setting LANGUAGE to CXX is not enough for clang, so use -x c++ to compile c files as c++ and suppress - # the following warning: - # clang++.exe: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated [-Wdeprecated] - target_compile_options(Lua PRIVATE -x c++) - - # For loslib.c, disable the following - # warning: 'tmpnam' is deprecated: tempnam is unsafe, use mkstemp or tmpfile instead [-Wdeprecated-declarations] - set_source_files_properties(src/loslib.c PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations) + # Setting LANGUAGE to CXX is not enough for clang, so use -x c++ to compile c files as c++ and suppress + # the following warning: + # clang++.exe: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated [-Wdeprecated] + target_compile_options(Lua PRIVATE -x c++) + + # For loslib.c, disable the following + # warning: 'tmpnam' is deprecated: tempnam is unsafe, use mkstemp or tmpfile instead [-Wdeprecated-declarations] + set_source_files_properties(src/loslib.c PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations) endif() source_group("src" FILES ${SOURCE}) source_group("include" FILES ${INCLUDE}) set_target_properties(Lua PROPERTIES - FOLDER Tools/External + FOLDER Tools/External ) \ No newline at end of file diff --git a/External/zlib-1.2.8/CMakeLists.txt b/External/zlib-1.2.8/CMakeLists.txt index 648c06d..ed5b2ff 100644 --- a/External/zlib-1.2.8/CMakeLists.txt +++ b/External/zlib-1.2.8/CMakeLists.txt @@ -3,35 +3,35 @@ cmake_minimum_required (VERSION 3.6) project(ZLib C) set(SOURCE - adler32.c - compress.c - crc32.c - deflate.c - gzclose.c - gzlib.c - gzread.c - gzwrite.c - infback.c - inffast.c - inflate.c - inftrees.c - trees.c - uncompr.c - zutil.c + adler32.c + compress.c + crc32.c + deflate.c + gzclose.c + gzlib.c + gzread.c + gzwrite.c + infback.c + inffast.c + inflate.c + inftrees.c + trees.c + uncompr.c + zutil.c ) set(INCLUDE - crc32.h - deflate.h - gzguts.h - inffast.h - inffixed.h - inflate.h - inftrees.h - trees.h - zconf.h - zlib.h - zutil.h + crc32.h + deflate.h + gzguts.h + inffast.h + inffixed.h + inflate.h + inftrees.h + trees.h + zconf.h + zlib.h + zutil.h ) add_library(ZLib STATIC ${SOURCE} ${INCLUDE}) @@ -41,18 +41,18 @@ target_link_libraries(ZLib PRIVATE BuildSettings) if(MSVC) target_compile_definitions(ZLib PRIVATE -D_CRT_SECURE_NO_DEPRECATE) - target_compile_options(ZLib PRIVATE /W3 /wd4131 /wd4127 /wd4244 /wd4996) + target_compile_options(ZLib PRIVATE /W3 /wd4131 /wd4127 /wd4244 /wd4996) endif() if(PLATFORM_ANDROID OR PLATFORM_MACOS OR PLATFORM_IOS) - target_compile_definitions(ZLib PRIVATE HAVE_UNISTD_H) + target_compile_definitions(ZLib PRIVATE HAVE_UNISTD_H) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR - CMAKE_CXX_COMPILER_ID MATCHES "GNU") - # For inflate.c, disable the following - # warning: shifting a negative signed value is undefined [-Wshift-negative-value] - set_source_files_properties(inflate.c PROPERTIES COMPILE_FLAGS -Wno-shift-negative-value) + CMAKE_CXX_COMPILER_ID MATCHES "GNU") + # For inflate.c, disable the following + # warning: shifting a negative signed value is undefined [-Wshift-negative-value] + set_source_files_properties(inflate.c PROPERTIES COMPILE_FLAGS -Wno-shift-negative-value) endif() @@ -62,5 +62,5 @@ source_group("src" FILES ${SOURCE}) source_group("include" FILES ${INCLUDE}) set_target_properties(ZLib PROPERTIES - FOLDER Tools/External + FOLDER Tools/External ) diff --git a/HLSL2GLSLConverter/CMakeLists.txt b/HLSL2GLSLConverter/CMakeLists.txt index 59e45be..6a5dd4b 100644 --- a/HLSL2GLSLConverter/CMakeLists.txt +++ b/HLSL2GLSLConverter/CMakeLists.txt @@ -3,35 +3,35 @@ cmake_minimum_required (VERSION 3.6) project(HLSL2GLSLConverter CXX) set(SOURCE - src/HLSL2GLSLConverterApp.cpp + src/HLSL2GLSLConverterApp.cpp ) if(PLATFORM_WIN32) - add_executable(HLSL2GLSLConverter ${SOURCE}) + add_executable(HLSL2GLSLConverter ${SOURCE}) else() - message(FATAL_ERROR "Unsupported platform") + message(FATAL_ERROR "Unsupported platform") endif() set_common_target_properties(HLSL2GLSLConverter) target_include_directories(HLSL2GLSLConverter PRIVATE - ../../DiligentCore/Graphics/HLSL2GLSLConverterLib/include + ../../DiligentCore/Graphics/HLSL2GLSLConverterLib/include ) target_compile_definitions(HLSL2GLSLConverter PRIVATE UNICODE) target_link_libraries(HLSL2GLSLConverter PRIVATE - BuildSettings - TargetPlatform - Common - GraphicsTools - HLSL2GLSLConverterLib - GraphicsEngineOpenGL-static + BuildSettings + TargetPlatform + Common + GraphicsTools + HLSL2GLSLConverterLib + GraphicsEngineOpenGL-static ) source_group("source" FILES ${SOURCE}) set_target_properties(HLSL2GLSLConverter PROPERTIES - FOLDER Tools + FOLDER Tools ) diff --git a/RenderScript/CMakeLists.txt b/RenderScript/CMakeLists.txt index 4b3b688..64b45de 100644 --- a/RenderScript/CMakeLists.txt +++ b/RenderScript/CMakeLists.txt @@ -3,64 +3,64 @@ cmake_minimum_required (VERSION 3.6) project(RenderScript CXX) set(INCLUDE - include/BlendStateDescParser.h - include/BufferParser.h - include/BufferViewParser.h - include/ClassMethodBinding.h - include/ConvenienceFunctions.h - include/Debug.h - include/DepthStencilStateDescParser.h - include/DeviceContextFuncBindings.h - include/DrawAttribsParser.h - include/EngineObjectParserBase.h - include/EngineObjectParserCommon.h - include/EnumMappings.h - include/InputLayoutDescParser.h - include/LuaBindings.h - include/LuaFunctionBinding.h - include/LuaWrappers.h - include/ParsingErrors.h - include/pch.h - include/PSODescParser.h - include/RasterizerStateDescParser.h - include/ResourceMappingParser.h - include/SamplerParser.h - include/ScissorRectParser.h - include/ScriptParser.h - include/ShaderParser.h - include/ShaderResourceBindingParser.h - include/ShaderVariableParser.h - include/TextureParser.h - include/TextureViewParser.h - include/ViewportParser.h + include/BlendStateDescParser.h + include/BufferParser.h + include/BufferViewParser.h + include/ClassMethodBinding.h + include/ConvenienceFunctions.h + include/Debug.h + include/DepthStencilStateDescParser.h + include/DeviceContextFuncBindings.h + include/DrawAttribsParser.h + include/EngineObjectParserBase.h + include/EngineObjectParserCommon.h + include/EnumMappings.h + include/InputLayoutDescParser.h + include/LuaBindings.h + include/LuaFunctionBinding.h + include/LuaWrappers.h + include/ParsingErrors.h + include/pch.h + include/PSODescParser.h + include/RasterizerStateDescParser.h + include/ResourceMappingParser.h + include/SamplerParser.h + include/ScissorRectParser.h + include/ScriptParser.h + include/ShaderParser.h + include/ShaderResourceBindingParser.h + include/ShaderVariableParser.h + include/TextureParser.h + include/TextureViewParser.h + include/ViewportParser.h ) set(SOURCE - src/BlendStateDescParser.cpp - src/BufferParser.cpp - src/BufferViewParser.cpp - src/DepthStencilStateDescParser.cpp - src/DeviceContextFuncBindings.cpp - src/DrawAttribsParser.cpp - src/EngineObjectParserBase.cpp - src/EnumMappings.cpp - src/InputLayoutDescParser.cpp - src/LuaBindings.cpp - src/LuaFunctionBinding.cpp - src/LuaWrappers.cpp - src/ParsingErrors.cpp - src/PSODescParser.cpp - src/RasterizerStateDescParser.cpp - src/ResourceMappingParser.cpp - src/SamplerParser.cpp - src/ScissorRectParser.cpp - src/ScriptParser.cpp - src/ShaderParser.cpp - src/ShaderResourceBindingParser.cpp - src/ShaderVariableParser.cpp - src/TextureParser.cpp - src/TextureViewParser.cpp - src/ViewportParser.cpp + src/BlendStateDescParser.cpp + src/BufferParser.cpp + src/BufferViewParser.cpp + src/DepthStencilStateDescParser.cpp + src/DeviceContextFuncBindings.cpp + src/DrawAttribsParser.cpp + src/EngineObjectParserBase.cpp + src/EnumMappings.cpp + src/InputLayoutDescParser.cpp + src/LuaBindings.cpp + src/LuaFunctionBinding.cpp + src/LuaWrappers.cpp + src/ParsingErrors.cpp + src/PSODescParser.cpp + src/RasterizerStateDescParser.cpp + src/ResourceMappingParser.cpp + src/SamplerParser.cpp + src/ScissorRectParser.cpp + src/ScriptParser.cpp + src/ShaderParser.cpp + src/ShaderResourceBindingParser.cpp + src/ShaderVariableParser.cpp + src/TextureParser.cpp + src/TextureViewParser.cpp + src/ViewportParser.cpp ) add_library(RenderScript STATIC ${SOURCE} ${INCLUDE}) @@ -68,16 +68,16 @@ set_common_target_properties(RenderScript) target_include_directories(RenderScript PUBLIC - include + include ) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR - CMAKE_CXX_COMPILER_ID MATCHES "GNU") - # Suppress warnings from applying the ‘offsetof’ macro to a non-POD type - # warning: offset of on non-standard-layout type [-Winvalid-offsetof] - # This is OK because the warning is generated for simple structs (such as TextureDesc) - # that fail to be a POD type only by virtue of having a constructor and comparison operator - target_compile_options(RenderScript PRIVATE -Wno-invalid-offsetof) + CMAKE_CXX_COMPILER_ID MATCHES "GNU") + # Suppress warnings from applying the ‘offsetof’ macro to a non-POD type + # warning: offset of on non-standard-layout type [-Winvalid-offsetof] + # This is OK because the warning is generated for simple structs (such as TextureDesc) + # that fail to be a POD type only by virtue of having a constructor and comparison operator + target_compile_options(RenderScript PRIVATE -Wno-invalid-offsetof) endif() source_group("source" FILES ${SOURCE}) @@ -85,15 +85,15 @@ source_group("include" FILES ${INCLUDE}) target_link_libraries(RenderScript PRIVATE - BuildSettings - GraphicsEngineInterface - GraphicsAccessories - Lua - Common - PlatformInterface - GraphicsTools + BuildSettings + GraphicsEngineInterface + GraphicsAccessories + Lua + Common + PlatformInterface + GraphicsTools ) set_target_properties(RenderScript PROPERTIES - FOLDER Tools + FOLDER Tools ) \ No newline at end of file diff --git a/TextureLoader/CMakeLists.txt b/TextureLoader/CMakeLists.txt index 094d93d..fba22de 100644 --- a/TextureLoader/CMakeLists.txt +++ b/TextureLoader/CMakeLists.txt @@ -3,22 +3,22 @@ cmake_minimum_required (VERSION 3.6) project(TextureLoader CXX) set(INCLUDE - include/DDSLoader.h - include/dxgiformat.h - include/pch.h + include/DDSLoader.h + include/dxgiformat.h + include/pch.h ) set(INTERFACE - interface/Image.h - interface/TextureLoader.h - interface/TextureUtilities.h + interface/Image.h + interface/TextureLoader.h + interface/TextureUtilities.h ) set(SOURCE - src/DDSLoader.cpp - src/Image.cpp - src/TextureLoader.cpp - src/TextureUtilities.cpp + src/DDSLoader.cpp + src/Image.cpp + src/TextureLoader.cpp + src/TextureUtilities.cpp ) add_library(TextureLoader STATIC ${SOURCE} ${INCLUDE} ${INTERFACE}) @@ -26,9 +26,9 @@ set_common_target_properties(TextureLoader) target_include_directories(TextureLoader PUBLIC - interface + interface PRIVATE - include + include ) source_group("source" FILES ${SOURCE}) @@ -37,17 +37,17 @@ source_group("interface" FILES ${INTERFACE}) target_link_libraries(TextureLoader PRIVATE - BuildSettings - Common - PlatformInterface - GraphicsEngineInterface - GraphicsAccessories - LibJpeg - LibPng - LibTiff - ZLib + BuildSettings + Common + PlatformInterface + GraphicsEngineInterface + GraphicsAccessories + LibJpeg + LibPng + LibTiff + ZLib ) set_target_properties(TextureLoader PROPERTIES - FOLDER Tools + FOLDER Tools ) \ No newline at end of file -- cgit v1.2.3