Fix syntax errors in CMakeLists

howetuft · howetuft · commit 50b5c977759e · 2026-05-03T00:24:22.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,7 +138,7 @@ endif()
 
 if(LINUX OR APPLE)
   add_link_options("LINKER:-Bsymbolic")
-endif
+endif()
 
 if (LUXRAYS_DISABLE_OPENCL)
   ADD_DEFINITIONS("-DLUXRAYS_DISABLE_OPENCL")
diff --git a/src/slg/CMakeLists.txt b/src/slg/CMakeLists.txt
@@ -511,15 +511,12 @@ target_link_libraries(slg-core PRIVATE
   OpenMP::OpenMP_CXX
 )
 
-<<<<<<< HEAD
-=======
 if(APPLE)
   target_link_libraries(slg-core PRIVATE llvm-openmp::llvm-openmp)
 else()
   target_link_libraries(slg-core PRIVATE OpenMP::OpenMP_CXX)
 endif(APPLE)
 
->>>>>>> parent of f285a9fbc (Replace llvm-openmp::llvm-openmp by plain OpenMP::OpenMP (due to dep evolution))
 #############################################################################
 #
 # SLG Kernels library

Original file line number	Diff line number	Diff line change
`@@ -511,15 +511,12 @@ target_link_libraries(slg-core PRIVATE`
`511`	`511`	`OpenMP::OpenMP_CXX`
`512`	`512`	`)`
`513`	`513`
`514`		`-<<<<<<< HEAD`
`515`		`-=======`
`516`	`514`	`if(APPLE)`
`517`	`515`	`target_link_libraries(slg-core PRIVATE llvm-openmp::llvm-openmp)`
`518`	`516`	`else()`
`519`	`517`	`target_link_libraries(slg-core PRIVATE OpenMP::OpenMP_CXX)`
`520`	`518`	`endif(APPLE)`
`521`	`519`
`522`		`->>>>>>> parent of f285a9fbc (Replace llvm-openmp::llvm-openmp by plain OpenMP::OpenMP (due to dep evolution))`
`523`	`520`	`#############################################################################`
`524`	`521`	`#`
`525`	`522`	`# SLG Kernels library`