remove bz

algbio · Jul 17, 2023 · 6f11184 · 6f11184
1 parent a5e4ff1
commit 6f11184
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,7 +141,6 @@ if(APPLE)
       ${BZIP2})
     target_link_options(kmc_core PRIVATE -lm -static-libgcc -static-libstdc++ -O3 -pthread -std=c++14)
   endif()
->>>>>>> ARM_support_merge
 else()
   target_compile_options(kmc_core PRIVATE -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14)
   target_link_libraries(kmc_core PRIVATE
@@ -171,7 +170,6 @@ if(APPLE)
       ${BZIP2})
     target_link_options(kmc_tools PRIVATE -lm -static-libgcc -static-libstdc++ -O3 -pthread -std=c++14)
   endif()
->>>>>>> ARM_support_merge
 else()
   target_compile_options(kmc_tools PRIVATE -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14)
   target_link_libraries(kmc_tools PRIVATE