Migrate to modern TBB version

Project-OSRM · Aug 19, 2022 · 5579895 · 5579895
1 parent b06ce37
commit 5579895
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -522,15 +522,10 @@ if(ENABLE_CONAN)
   set(Boost_REGEX_LIBRARY "${Boost_regex_LIB_TARGETS}")
   set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY "${Boost_unit_test_framework_LIB_TARGETS}")
 
-<<<<<<< HEAD
+
   find_package(BZip2 REQUIRED)
   find_package(EXPAT REQUIRED)
   find_package(lua REQUIRED)
-=======
-  find_package(BZip2 REQUIRED EXACT ${CONAN_BZIP2_VERSION})
-  find_package(EXPAT REQUIRED)
-  find_package(lua REQUIRED EXACT ${CONAN_LUA_VERSION})
->>>>>>> 1bf46d64b (Migrate to modern TBB version)
   set(LUA_LIBRARIES ${lua_LIBRARIES})
 
   find_package(TBB REQUIRED)