Merge pull request #26 from JPenuchot/ubuntu-ci-fix

Ubuntu CI fix
JPenuchot · May 19, 2023 · d503aa4 · d503aa4
2 parents db8a089 + f2ae8d7
commit d503aa4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmake/ctbench-compile-opts.cmake b/cmake/ctbench-compile-opts.cmake
@@ -15,4 +15,6 @@ target_compile_options(
             -flto
             -fPIC)
 
+target_link_options(ctbench-compile-opts INTERFACE -flto)
+
 target_compile_features(ctbench-compile-opts INTERFACE cxx_std_20)
diff --git a/grapher/cmake/grapher-target.cmake b/grapher/cmake/grapher-target.cmake
@@ -10,5 +10,4 @@ target_link_libraries(
   grapher PUBLIC ctbench-compile-opts nlohmann_json::nlohmann_json
   sciplot::sciplot fmt::fmt stdc++fs tbb ${llvm_libs})
 
-target_compile_options(grapher PUBLIC -DJSON_NOEXCEPTION -march=native -flto)
-target_link_options(grapher PUBLIC -flto)
+target_compile_options(grapher PUBLIC -DJSON_NOEXCEPTION)
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,6 @@ target_compile_options( @@
                 -flto
                 -fPIC)
+    target_link_options(ctbench-compile-opts INTERFACE -flto)
     target_compile_features(ctbench-compile-opts INTERFACE cxx_std_20)