Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

Update Orbit to Conan 2 #4882

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")

Expand All @@ -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)
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down
22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


[orbit_youtube_presentation]: contrib/logos/orbit_presentation_youtube.png


To compile on Windows:
conan install . --build="abseil/*" --build="protobuf/*" --build="grpc/*" --build=missing
cd build
cmake -DCMAKE_TOOLCHAIN_FILE=build/generators/conan_toolchain.cmake ..
cmake --build . --config Release


To compile on Linux:

conan install . --build=missing
cd build
cmake -DCMAKE_TOOLCHAIN_FILE=build/generators/conan_toolchain.cmake ..
cmake --build . --config Release

with a debug profile:

Debug example:
conan install . -pr:a third_party/conan/configs/linux/profiles/gcc17_debug --build=missing -of build_gcc17_debug
cmake -B build_gcc17_debug -DCMAKE_TOOLCHAIN_FILE=build_gcc17_debug/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Debug .
cmake --build build_gcc17_debug --paralell
74 changes: 0 additions & 74 deletions bootstrap-orbit.ps1

This file was deleted.

172 changes: 0 additions & 172 deletions bootstrap-orbit.sh

This file was deleted.

Loading