diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,17 +93,17 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") add_compiler_flag(-fPIC) endif() - + if(ENABLE_HARDENING) # Enable stack protection add_cxx_compiler_flag(-fstack-protector-all -Wstack-protector) - + # Enable some buffer overflow checking add_compiler_flag(-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2) - + # Enable ASLR (these flags are primarily targeting MinGw) add_linker_flag(-Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va) - + # Make the relocated sections read-only add_linker_flag(-Wl,-z,relro -Wl,-z,now) @@ -246,7 +246,7 @@ find_library(WS2_32_LIBRARY NAMES ws2_32) target_link_libraries(util ${WS2_32_LIBRARY}) - + target_compile_definitions(util PUBLIC BOOST_THREAD_USE_LIB) endif() diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -139,7 +139,7 @@ list(APPEND QT_PLUGIN_COMPONENTS QCocoaIntegrationPlugin) list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_COCOA=1) - target_sources(bitcoin-qt-base PRIVATE + target_sources(bitcoin-qt-base PRIVATE macdockiconhandler.mm macnotificationhandler.mm ) diff --git a/src/qt/test/CMakeLists.txt b/src/qt/test/CMakeLists.txt --- a/src/qt/test/CMakeLists.txt +++ b/src/qt/test/CMakeLists.txt @@ -13,7 +13,7 @@ rpcnestedtests.cpp test_main.cpp uritests.cpp - + # Test framework ../../test/test_bitcoin.cpp ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -24,7 +24,7 @@ ### # Setup symlinks for testing -### +### macro(make_link src dest) add_custom_command( OUTPUT "${dest}" @@ -74,4 +74,4 @@ ) add_dependencies(check check-bitcoin-util) -endif() \ No newline at end of file +endif()