switches to Conan 2

CMakeLists.txt

@@ -8,11 +8,9 @@ option(FULL_TEST_SUITE "enable also long-running tests" OFF)
 option(ENABLE_SCV "Enable use of SCV" OFF)
 option(ENABLE_CLANG_TIDY "Enable clang-tidy checks" OFF)
 
-include(ConanInline)
 include(GNUInstallDirs)
 include(BuildType)
 
-set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -20,14 +18,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
 
-if(COMPILER_SUPPORTS_MARCH_NATIVE)
-	if("${CMAKE_BUILD_TYPE}" STREQUAL "") 
-	    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-	elseif(NOT(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-	endif()
-endif()
-
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(warnings "-Wall -Wextra -Werror")
     set(CMAKE_CXX_FLAG_RELEASE "-O3 -DNDEBUG")
@@ -39,11 +29,10 @@ endif()
 if(ENABLE_COVERAGE)
     include(CodeCoverage)
     append_coverage_compiler_flags()
-    set(COVERAGE_EXCLUDES "osci-lib/scc/*" "/engr/dev/tools/*")
 endif()
 
-find_program(CLANG_TIDY_EXE NAMES "clang-tidy")
 if(ENABLE_CLANG_TIDY)
+	find_program(CLANG_TIDY_EXE NAMES "clang-tidy")
 	if(CLANG_TIDY_EXE)
 	  	message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
 	  	#set(CLANG_TIDY_CHECKS "-*,modernize-*,-modernize-use-trailing-return-type,clang-analyzer-core.*,clang-analyzer-cplusplus.*")
@@ -56,15 +45,6 @@ endif()
 
 set(CLANG_FORMAT_EXCLUDE_PATTERNS "/third_party/")
 find_package(ClangFormat)
-
-set(CONAN_CMAKE_SILENT_OUTPUT ON)
-conan_check()
-conan_configure(REQUIRES jsoncpp/1.9.5 yaml-cpp/0.6.3 spdlog/1.9.2 fmt/8.0.1 boost/1.85.0 gsl-lite/0.37.0 systemc/2.3.4 catch2/3.1.0 zlib/1.2.11 lz4/1.9.4
-                GENERATORS cmake_find_package
-                OPTIONS fmt:header_only=True spdlog:header_only=True 
-                )
-conan_install()
-
 find_package(ZLIB)
 find_package(lz4)
 # This line finds the boost lib and headers.