diff --git a/fuse-7z/CMakeLists.txt b/fuse-7z/CMakeLists.txt index 1ba0e46..451dcbb 100644 --- a/fuse-7z/CMakeLists.txt +++ b/fuse-7z/CMakeLists.txt @@ -148,7 +148,8 @@ if(WINDOWS) file(GLOB_RECURSE win_syslog_sources "${win_syslog_dir}/*.cpp" "${win_syslog_dir}/*.c") endif(WINDOWS) -set(lib7zip_lib "${lib7zip_binDir}/lib7zip.a") +set(lib7zip_lib "-l7zip") +set(lib7zip_includeDir "/usr/include/lib7zip") message(STATUS "lib7zip lib is ${lib7zip_lib}") message(STATUS "lib7zip include dir is ${lib7zip_includeDir}") @@ -175,11 +176,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcet -fsanitize=cfi") endif() - set_target_properties(fuse_7z_ng PROPERTIES LINK_FLAGS "-Wl,-O1,--sort-common,--as-needed,--dynamicbase,--nxcompat,--export-all-symbols,-flto") - - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set_target_properties(fuse_7z_ng PROPERTIES LINK_FLAGS "-Wl,--image-base,0x140000000") - endif() elseif(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /sdl /GS /SafeSEH /NXCOMPAT /dynamicbase /guard:cf /HIGHENTROPYVA") set_target_properties(fuse_7z_ng PROPERTIES LINK_FLAGS "/guard:cf") aarch64 fix diff --git a/fuse-7z/CMakeLists.txt b/fuse-7z/CMakeLists.txt index 1ba0e46..3fab74c 100644 --- a/fuse-7z/CMakeLists.txt +++ b/fuse-7z/CMakeLists.txt @@ -169,7 +169,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") #-flto #-pie set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wconversion -Wformat -Werror=format-security") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -mmitigate-rop -fno-common -fstack-check") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -fno-common -fstack-check") add_definitions("-D_FORTIFY_SOURCE=2") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")