diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-14 02:32:57 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-14 02:32:57 +0000 |
| commit | fd8cced335c46f2228fb0b6abb124168bb9e0602 (patch) | |
| tree | 26b1a4d94845578725c38941076fabab2c376845 /External | |
| parent | Updated CMakeLists (diff) | |
| download | DiligentTools-fd8cced335c46f2228fb0b6abb124168bb9e0602.tar.gz DiligentTools-fd8cced335c46f2228fb0b6abb124168bb9e0602.zip | |
Added UWP to cmake
Diffstat (limited to 'External')
| -rw-r--r-- | External/libjpeg-9a/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | External/libtiff-4.0.3/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | External/lpng-1.6.17/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | External/lua-5.2.3/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | External/zlib-1.2.8/CMakeLists.txt | 2 |
5 files changed, 18 insertions, 9 deletions
diff --git a/External/libjpeg-9a/CMakeLists.txt b/External/libjpeg-9a/CMakeLists.txt index e727ea9..9c17681 100644 --- a/External/libjpeg-9a/CMakeLists.txt +++ b/External/libjpeg-9a/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.8) project(LibJpeg C) @@ -77,7 +77,9 @@ if(MSVC) # - 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() # Enable link-time code generation for release builds (I was not able to # find any way to set these settings through interface library BuildSettings) set_target_properties(LibJpeg PROPERTIES diff --git a/External/libtiff-4.0.3/CMakeLists.txt b/External/libtiff-4.0.3/CMakeLists.txt index 0a59cd2..2dbf046 100644 --- a/External/libtiff-4.0.3/CMakeLists.txt +++ b/External/libtiff-4.0.3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.8) project(LibTiff C) @@ -45,9 +45,9 @@ set(SOURCE libtiff/tif_zip.c ) -if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) +if(PLATFORM_WIN32) list(APPEND SOURCE libtiff/tif_win32.c) -elseif(PLATFORM_ANDROID) +elseif(PLATFORM_ANDROID OR PLATFORM_UNIVERSAL_WINDOWS) list(APPEND SOURCE libtiff/tif_unix.c) else() message(FATAL_ERROR "Unknown platform") @@ -84,6 +84,11 @@ if(MSVC) 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() + # Enable link-time code generation for release builds (I was not able to # find any way to set these settings through interface library BuildSettings) set_target_properties(LibTiff PROPERTIES diff --git a/External/lpng-1.6.17/CMakeLists.txt b/External/lpng-1.6.17/CMakeLists.txt index 64390a8..1f669c7 100644 --- a/External/lpng-1.6.17/CMakeLists.txt +++ b/External/lpng-1.6.17/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.8) project(LibPng C) @@ -35,7 +35,9 @@ add_library( 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() # Enable link-time code generation for release builds (I was not able to # find any way to set these settings through interface library BuildSettings) set_target_properties(LibPng PROPERTIES diff --git a/External/lua-5.2.3/CMakeLists.txt b/External/lua-5.2.3/CMakeLists.txt index ece89a0..85f1ab8 100644 --- a/External/lua-5.2.3/CMakeLists.txt +++ b/External/lua-5.2.3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.8) project(Lua CXX) diff --git a/External/zlib-1.2.8/CMakeLists.txt b/External/zlib-1.2.8/CMakeLists.txt index 43a7a03..11be21a 100644 --- a/External/zlib-1.2.8/CMakeLists.txt +++ b/External/zlib-1.2.8/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.8) project(ZLib C) |