- updated CMake project files.

This commit is contained in:
Christoph Oelckers 2021-03-14 16:44:58 +01:00
parent 834da8b83b
commit c3071edc60
14 changed files with 22 additions and 28 deletions

View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.7) cmake_minimum_required( VERSION 3.1.0 )
#make_release_only() #make_release_only()

View file

@ -1,11 +1,7 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
make_release_only() 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_definitions( -DBZ_NO_STDIO )
add_library( bz2 STATIC add_library( bz2 STATIC
blocksort.c blocksort.c

View file

@ -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" ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )

View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required( VERSION 3.1.0 )
make_release_only() make_release_only()
use_fast_math() use_fast_math()

View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required( VERSION 3.1.0 )
make_release_only() make_release_only()
use_fast_math() use_fast_math()

View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required( VERSION 3.1.0 )
make_release_only() make_release_only()
use_fast_math() use_fast_math()
@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
SPVRemapper.h SPVRemapper.h
doc.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 FOLDER glslang)
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(SPIRV PUBLIC target_include_directories(SPIRV PUBLIC

View file

@ -1,4 +1,4 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
make_release_only() make_release_only()

View file

@ -1,11 +1,7 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
make_release_only() 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( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_PPMD_SUPPPORT" )
set( LZMA_FILES set( LZMA_FILES

View file

@ -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) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
make_release_only() make_release_only()

View file

@ -1,4 +1,4 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
add_subdirectory( re2c ) add_subdirectory( re2c )
add_subdirectory( lemon ) add_subdirectory( lemon )

View file

@ -1,14 +1,14 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
if( NOT CMAKE_CROSSCOMPILING ) if( NOT CMAKE_CROSSCOMPILING )
set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )
add_executable( lemon lemon.c ) add_executable( lemon lemon.c )
set( CROSS_EXPORTS ${CROSS_EXPORTS} lemon PARENT_SCOPE ) set( CROSS_EXPORTS ${CROSS_EXPORTS} lemon PARENT_SCOPE )
endif()
# Lemon wants lempar.c in its directory # Lemon wants lempar.c in its directory
add_custom_command( TARGET lemon add_custom_command( TARGET lemon
POST_BUILD POST_BUILD
COMMAND echo $<TARGET_FILE_DIR:lemon> COMMAND echo $<TARGET_FILE_DIR:lemon>
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lempar.c $<TARGET_FILE_DIR:lemon> ) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lempar.c $<TARGET_FILE_DIR:lemon> )
endif()

View file

@ -1,4 +1,4 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
if( NOT CMAKE_CROSSCOMPILING ) if( NOT CMAKE_CROSSCOMPILING )

View file

@ -1,4 +1,4 @@
cmake_minimum_required( VERSION 2.8.7 ) cmake_minimum_required( VERSION 3.1.0 )
if( NOT CMAKE_CROSSCOMPILING ) if( NOT CMAKE_CROSSCOMPILING )
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )

View file

@ -781,6 +781,8 @@ void write_zip(const char *zipname, dir_tree_t *trees, int update)
if (central_dir == NULL) if (central_dir == NULL)
{ {
fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname); fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname);
fclose(ozip);
ozip = NULL;
update = 0; update = 0;
} }
} }