Linux compiling with conan 2, clean-up required

CMakeLists.txt

@@ -67,13 +67,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(WITH_GUI "Setting this option will enable the Qt-based UI client." ON)
 
-if(NOT WIN32)
-  option(WITH_VULKAN "Setting this option will enable Vulkan" ON)
+#if(NOT WIN32)
+#  option(WITH_VULKAN "Setting this option will enable Vulkan" ON)
 
-  if(WITH_VULKAN)
-    add_definitions(-DVULKAN_ENABLED)
-  endif()
-endif()
+#  if(WITH_VULKAN)
+#    add_definitions(-DVULKAN_ENABLED)
+#  endif()
+#endif()
 
 # This is only for designated initializers
 if(WIN32)
@@ -82,6 +82,8 @@ else()
   set(CMAKE_CXX_STANDARD 17)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS ON)
+
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -104,7 +106,7 @@ find_package(Threads REQUIRED)
 find_package(xxHash REQUIRED)
 find_package(concurrentqueue REQUIRED)
 find_package(gte REQUIRED)
-find_package(libprotobuf-mutator REQUIRED)
+#find_package(libprotobuf-mutator REQUIRED)
 find_package(LZMA REQUIRED)
 find_package(absl REQUIRED)
 find_package(LLVM REQUIRED)
@@ -144,7 +146,7 @@ endif()
 
 include("cmake/protobuf.cmake")
 include("cmake/grpc_helper.cmake")
-include("cmake/fuzzing.cmake")
+#include("cmake/fuzzing.cmake")
 include("cmake/tests.cmake")
 include("cmake/iwyu.cmake")
 enable_testing()
@@ -211,7 +213,7 @@ add_subdirectory(src/Containers)
 add_subdirectory(src/CrashService)
 add_subdirectory(src/DisplayFormats)
 add_subdirectory(src/FakeProducerSideService)
-add_subdirectory(src/FuzzingUtils)
+#add_subdirectory(src/FuzzingUtils)
 add_subdirectory(src/GrpcProtos)
 add_subdirectory(src/Introspection)
 add_subdirectory(src/ModuleUtils)

conanfile.py

@@ -21,9 +21,9 @@ def requirements(self):
         self.requires("outcome/2.2.9")
         self.requires("llvm-core/13.0.0")
         if self.settings.os != "Windows":
-            self.requires("volk/1.3.268.0")
-            self.requires("vulkan-headers/1.3.290.0")
-            self.requires("vulkan-validationlayers/1.3.290.0")
+            self.requires("volk/1.3.239.0")
+            self.requires("vulkan-headers/1.3.239")
+            #self.requires("vulkan-validationlayers/1.3.239.0")
         self.requires("zlib/1.3.1", override=True)
         self.requires("openssl/3.3.2", override=True)
         self.requires("libssh2/1.11.0")

src/CaptureClient/CMakeLists.txt

@@ -38,10 +38,6 @@ target_link_libraries(CaptureClient PUBLIC
         GrpcProtos
         Introspection)
 
-add_fuzzer(CaptureEventProcessorProcessEventsFuzzer CaptureEventProcessorProcessEventsFuzzer.cpp)
-target_link_libraries(CaptureEventProcessorProcessEventsFuzzer
-        PRIVATE CaptureClient FuzzingUtils)
-
 add_executable(CaptureClientTests)
 
 target_sources(CaptureClientTests PRIVATE

src/ClientData/CMakeLists.txt

@@ -126,8 +126,3 @@ target_link_libraries(ClientDataTests PRIVATE
         GTest_Main)
 
 register_test(ClientDataTests)
-
-add_fuzzer(ModuleLoadSymbolsFuzzer ModuleLoadSymbolsFuzzer.cpp)
-target_link_libraries(
-        ModuleLoadSymbolsFuzzer PRIVATE ClientData
-        FuzzingUtils)

src/ObjectUtils/CMakeLists.txt

@@ -98,5 +98,3 @@ target_link_libraries(
 
 register_test(ObjectUtilsTests)
 
-add_fuzzer(ElfFileLoadSymbolsFuzzer ElfFileLoadSymbolsFuzzer.cpp)
-target_link_libraries(ElfFileLoadSymbolsFuzzer FuzzingUtils ObjectUtils)

src/OrbitBase/CMakeLists.txt

@@ -17,7 +17,6 @@ target_include_directories(OrbitBase PRIVATE
 target_sources(OrbitBase PRIVATE
         include/OrbitBase/Action.h
         include/OrbitBase/Align.h
-        include/OrbitBase/AnyErrorOf.h
         include/OrbitBase/AnyInvocable.h
         include/OrbitBase/AnyMovable.h
         include/OrbitBase/Append.h
@@ -109,7 +108,6 @@ add_executable(OrbitBaseTests)
 target_sources(OrbitBaseTests PRIVATE
         AlignTest.cpp
         AnyInvocableTest.cpp
-        AnyErrorOfTest.cpp
         AnyMovableTest.cpp
         AppendTest.cpp
         CanceledOrTest.cpp