From c3071edc6065611995c79495e39a3f0be7d4613b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Mar 2021 16:44:58 +0100 Subject: [PATCH] - updated CMake project files. --- libraries/asmjit/CMakeLists.txt | 2 +- libraries/bzip2/CMakeLists.txt | 6 +----- libraries/gdtoa/CMakeLists.txt | 2 +- libraries/glslang/OGLCompilersDLL/CMakeLists.txt | 2 +- libraries/glslang/glslang/CMakeLists.txt | 2 +- libraries/glslang/spirv/CMakeLists.txt | 4 ++-- libraries/jpeg/CMakeLists.txt | 2 +- libraries/lzma/CMakeLists.txt | 6 +----- libraries/zlib/CMakeLists.txt | 2 +- tools/CMakeLists.txt | 2 +- tools/lemon/CMakeLists.txt | 14 +++++++------- tools/re2c/CMakeLists.txt | 2 +- tools/zipdir/CMakeLists.txt | 2 +- tools/zipdir/zipdir.c | 2 ++ 14 files changed, 22 insertions(+), 28 deletions(-) diff --git a/libraries/asmjit/CMakeLists.txt b/libraries/asmjit/CMakeLists.txt index 6b7636ebe..283b54fbc 100644 --- a/libraries/asmjit/CMakeLists.txt +++ b/libraries/asmjit/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required( VERSION 3.1.0 ) #make_release_only() diff --git a/libraries/bzip2/CMakeLists.txt b/libraries/bzip2/CMakeLists.txt index bd0048e78..6ca7a4e6d 100644 --- a/libraries/bzip2/CMakeLists.txt +++ b/libraries/bzip2/CMakeLists.txt @@ -1,11 +1,7 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() -if( DEM_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fomit-frame-pointer" ) -endif() - add_definitions( -DBZ_NO_STDIO ) add_library( bz2 STATIC blocksort.c diff --git a/libraries/gdtoa/CMakeLists.txt b/libraries/gdtoa/CMakeLists.txt index 8f370fc67..34088c4f9 100644 --- a/libraries/gdtoa/CMakeLists.txt +++ b/libraries/gdtoa/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" ) diff --git a/libraries/glslang/OGLCompilersDLL/CMakeLists.txt b/libraries/glslang/OGLCompilersDLL/CMakeLists.txt index c6e6c8fc2..392fa7900 100644 --- a/libraries/glslang/OGLCompilersDLL/CMakeLists.txt +++ b/libraries/glslang/OGLCompilersDLL/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() use_fast_math() diff --git a/libraries/glslang/glslang/CMakeLists.txt b/libraries/glslang/glslang/CMakeLists.txt index 3cd287b39..30b57c588 100644 --- a/libraries/glslang/glslang/CMakeLists.txt +++ b/libraries/glslang/glslang/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() use_fast_math() diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt index 453ac16b5..16df27d7b 100644 --- a/libraries/glslang/spirv/CMakeLists.txt +++ b/libraries/glslang/spirv/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() use_fast_math() @@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS SPVRemapper.h doc.h) -add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) +add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS}) set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(SPIRV PUBLIC diff --git a/libraries/jpeg/CMakeLists.txt b/libraries/jpeg/CMakeLists.txt index 7cc0b64d1..40bc7004b 100644 --- a/libraries/jpeg/CMakeLists.txt +++ b/libraries/jpeg/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() diff --git a/libraries/lzma/CMakeLists.txt b/libraries/lzma/CMakeLists.txt index a9693742f..570265049 100644 --- a/libraries/lzma/CMakeLists.txt +++ b/libraries/lzma/CMakeLists.txt @@ -1,11 +1,7 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) make_release_only() -if( DEM_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fomit-frame-pointer" ) -endif() - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_PPMD_SUPPPORT" ) set( LZMA_FILES diff --git a/libraries/zlib/CMakeLists.txt b/libraries/zlib/CMakeLists.txt index a1d6637a9..14f0175f6 100644 --- a/libraries/zlib/CMakeLists.txt +++ b/libraries/zlib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required( VERSION 3.1.0 ) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) make_release_only() diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index b3fed70ff..8725c56e8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) add_subdirectory( re2c ) add_subdirectory( lemon ) diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt index e092cf6e9..71418eda5 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt @@ -1,14 +1,14 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) if( NOT CMAKE_CROSSCOMPILING ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" ) add_executable( lemon lemon.c ) set( CROSS_EXPORTS ${CROSS_EXPORTS} lemon PARENT_SCOPE ) -endif() -# Lemon wants lempar.c in its directory -add_custom_command( TARGET lemon - POST_BUILD - COMMAND echo $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lempar.c $ ) + # Lemon wants lempar.c in its directory + add_custom_command( TARGET lemon + POST_BUILD + COMMAND echo $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lempar.c $ ) +endif() diff --git a/tools/re2c/CMakeLists.txt b/tools/re2c/CMakeLists.txt index b362a3b84..9fcfef5a2 100644 --- a/tools/re2c/CMakeLists.txt +++ b/tools/re2c/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) if( NOT CMAKE_CROSSCOMPILING ) diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt index 6a36b2cb5..65eb2fb72 100644 --- a/tools/zipdir/CMakeLists.txt +++ b/tools/zipdir/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8.7 ) +cmake_minimum_required( VERSION 3.1.0 ) if( NOT CMAKE_CROSSCOMPILING ) include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) diff --git a/tools/zipdir/zipdir.c b/tools/zipdir/zipdir.c index 4cb98c138..dab0dac04 100644 --- a/tools/zipdir/zipdir.c +++ b/tools/zipdir/zipdir.c @@ -781,6 +781,8 @@ void write_zip(const char *zipname, dir_tree_t *trees, int update) if (central_dir == NULL) { fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname); + fclose(ozip); + ozip = NULL; update = 0; } }