nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-05-20 18:34:29 -05:00
Code Issues Projects Releases Wiki Activity

Use indentations

Browse Source
This commit is contained in:
olszomal 2023-04-28 15:55:18 +02:00 committed by Michał Trojnara
parent eec5a0755d
commit fb731f2b5e
5 changed files with 187 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -90,6 +90,14 @@ else(UNIX)
PATTERN "*.dll" PATTERN "*.dll"
PATTERN "vcpkg_installed" EXCLUDE PATTERN "vcpkg_installed" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE PATTERN "CMakeFiles" EXCLUDE
PATTERN "Testing" EXCLUDE PATTERN "Testing" EXCLUDE)
)
endif(UNIX) endif(UNIX)
#[[
Local Variables:
c-basic-offset: 4
tab-width: 4
indent-tabs-mode: nil
End:
vim: set ts=4 expandtab:
]]

9
cmake/CMakeDist.cmake
View File

@ -25,3 +25,12 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "/build/")
include(CPack) include(CPack)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
#[[
Local Variables:
c-basic-offset: 4
tab-width: 4
indent-tabs-mode: nil
End:
vim: set ts=4 expandtab:
]]

9
cmake/FindHeaders.cmake
View File

@ -15,3 +15,12 @@ endif(UNIX)
if(NOT (HAVE_MMAP OR HAVE_MAPVIEWOFFILE)) if(NOT (HAVE_MMAP OR HAVE_MAPVIEWOFFILE))
message(FATAL_ERROR "Error: Need file mapping function to build.") message(FATAL_ERROR "Error: Need file mapping function to build.")
endif(NOT (HAVE_MMAP OR HAVE_MAPVIEWOFFILE)) endif(NOT (HAVE_MMAP OR HAVE_MAPVIEWOFFILE))
#[[
Local Variables:
c-basic-offset: 4
tab-width: 4
indent-tabs-mode: nil
End:
vim: set ts=4 expandtab:
]]

9
cmake/SetBashCompletion.cmake
View File

@ -21,3 +21,12 @@ if(NOT MSVC)
message(STATUS "Using bash completions dir ${BASH_COMPLETION_COMPLETIONSDIR}") message(STATUS "Using bash completions dir ${BASH_COMPLETION_COMPLETIONSDIR}")
install(FILES "osslsigncode.bash" DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}) install(FILES "osslsigncode.bash" DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR})
endif(NOT MSVC) endif(NOT MSVC)
#[[
Local Variables:
c-basic-offset: 4
tab-width: 4
indent-tabs-mode: nil
End:
vim: set ts=4 expandtab:
]]

42
cmake/SetCompilerFlags.cmake
View File

@ -7,9 +7,9 @@ function(add_debug_flag_if_supported flagname targets)
if (HAVE_FLAG_${flagname}) if (HAVE_FLAG_${flagname})
foreach(target ${targets}) foreach(target ${targets})
target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:${flagname}>) target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:${flagname}>)
endforeach() endforeach(target ${targets})
endif() endif(HAVE_FLAG_${flagname})
endfunction() endfunction(add_debug_flag_if_supported flagname targets)
function(add_compile_flag_to_targets targets) function(add_compile_flag_to_targets targets)
set(CHECKED_DEBUG_FLAGS set(CHECKED_DEBUG_FLAGS
@ -44,12 +44,11 @@ function(add_compile_flag_to_targets targets)
"-Wmisleading-indentation" "-Wmisleading-indentation"
"-Wabsolute-value" "-Wabsolute-value"
"-Wunused-parameter" "-Wunused-parameter"
"-Wunused-function" "-Wunused-function")
)
foreach(flag ${CHECKED_DEBUG_FLAGS}) foreach(flag ${CHECKED_DEBUG_FLAGS})
add_debug_flag_if_supported(${flag} ${targets}) add_debug_flag_if_supported(${flag} ${targets})
endforeach() endforeach(flag ${CHECKED_DEBUG_FLAGS})
endfunction() endfunction(add_compile_flag_to_targets targets)
function(add_compile_flags target) function(add_compile_flags target)
if(MSVC) if(MSVC)
@ -76,12 +75,12 @@ function(add_compile_flags target)
# Enable generation of EH Continuation (EHCONT) metadata by the compiler # Enable generation of EH Continuation (EHCONT) metadata by the compiler
#target_compile_options(${target} PRIVATE /guard:ehcont) #target_compile_options(${target} PRIVATE /guard:ehcont)
#target_link_options(${target} PRIVATE /guard:ehcont) #target_link_options(${target} PRIVATE /guard:ehcont)
else() else("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
# Can handle addresses larger than 2 gigabytes # Can handle addresses larger than 2 gigabytes
target_link_options(${target} PRIVATE /LARGEADDRESSAWARE) target_link_options(${target} PRIVATE /LARGEADDRESSAWARE)
# Safe structured exception handlers (x86 only) # Safe structured exception handlers (x86 only)
target_link_options(${target} PRIVATE /SAFESEH) target_link_options(${target} PRIVATE /SAFESEH)
endif() endif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:/D_FORTIFY_SOURCE=2>) target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:/D_FORTIFY_SOURCE=2>)
# Unrecognized compiler options are errors # Unrecognized compiler options are errors
target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:/options:strict>) target_compile_options(${target} PRIVATE $<$<CONFIG:DEBUG>:/options:strict>)
@ -89,25 +88,36 @@ function(add_compile_flags target)
check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL) check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
if(HAVE_STACK_PROTECTOR_ALL) if(HAVE_STACK_PROTECTOR_ALL)
target_link_options(${target} PRIVATE -fstack-protector-all) target_link_options(${target} PRIVATE -fstack-protector-all)
else() else(HAVE_STACK_PROTECTOR_ALL)
check_c_compiler_flag("-fstack-protector" HAVE_STACK_PROTECTOR) check_c_compiler_flag("-fstack-protector" HAVE_STACK_PROTECTOR)
if(HAVE_STACK_PROTECTOR) if(HAVE_STACK_PROTECTOR)
target_link_options(${target} PRIVATE -fstack-protector) target_link_options(${target} PRIVATE -fstack-protector)
else() else(HAVE_STACK_PROTECTOR)
message(WARNING "No stack protection supported") message(WARNING "No stack protection supported")
endif() endif(HAVE_STACK_PROTECTOR)
endif() endif(HAVE_STACK_PROTECTOR_ALL)
# Support address space layout randomization (ASLR) # Support address space layout randomization (ASLR)
if(NOT (MINGW OR CYGWIN OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR ((CMAKE_SYSTEM_NAME MATCHES Darwin) AND (CMAKE_C_COMPILER_ID MATCHES Clang)))) if(NOT (MINGW OR CYGWIN OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
OR ((CMAKE_SYSTEM_NAME MATCHES Darwin) AND (CMAKE_C_COMPILER_ID MATCHES Clang))))
target_compile_options(${target} PRIVATE -fPIE) target_compile_options(${target} PRIVATE -fPIE)
target_link_options(${target} PRIVATE -fPIE -pie) target_link_options(${target} PRIVATE -fPIE -pie)
target_link_options(${target} PRIVATE -Wl,-z,relro) target_link_options(${target} PRIVATE -Wl,-z,relro)
target_link_options(${target} PRIVATE -Wl,-z,now) target_link_options(${target} PRIVATE -Wl,-z,now)
target_link_options(${target} PRIVATE -Wl,-z,noexecstack) target_link_options(${target} PRIVATE -Wl,-z,noexecstack)
endif(NOT (MINGW OR CYGWIN OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR ((CMAKE_SYSTEM_NAME MATCHES Darwin) AND (CMAKE_C_COMPILER_ID MATCHES Clang)))) endif(NOT (MINGW OR CYGWIN OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
OR ((CMAKE_SYSTEM_NAME MATCHES Darwin) AND (CMAKE_C_COMPILER_ID MATCHES Clang))))
target_link_options(${target} PRIVATE -fstack-check) target_link_options(${target} PRIVATE -fstack-check)
add_compile_flag_to_targets(${target}) add_compile_flag_to_targets(${target})
endif(MSVC) endif(MSVC)
endfunction() endfunction(add_compile_flags target)
add_compile_flags(osslsigncode) add_compile_flags(osslsigncode)
#[[
Local Variables:
c-basic-offset: 4
tab-width: 4
indent-tabs-mode: nil
End:
vim: set ts=4 expandtab:
]]