Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unnest the extra "melatonin_perfetto" directory #21

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
10 changes: 6 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if (MelatoninPerfetto_IS_TOP_LEVEL)
GIT_TAG origin/master
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
FIND_PACKAGE_ARGS 7.0.3)
FIND_PACKAGE_ARGS 7.0.6)

FetchContent_MakeAvailable(JUCE)
endif ()
Expand All @@ -37,7 +37,7 @@ message (STATUS "Cloning Perfetto...")

FetchContent_Declare(Perfetto
GIT_REPOSITORY https://android.googlesource.com/platform/external/perfetto
GIT_TAG v33.1
GIT_TAG v37.0
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE)

Expand Down Expand Up @@ -105,7 +105,7 @@ cpack_add_component(perfetto
DISPLAY_NAME "Perfetto"
DESCRIPTION "The Perfetto profiling library")

juce_add_module("${CMAKE_CURRENT_LIST_DIR}/melatonin_perfetto")
juce_add_module("${CMAKE_CURRENT_SOURCE_DIR}")

target_link_libraries(melatonin_perfetto INTERFACE perfetto::perfetto)

Expand All @@ -131,7 +131,7 @@ endif()

add_library(Melatonin::Perfetto ALIAS melatonin_perfetto)

install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/melatonin_perfetto"
install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
DESTINATION "${MP_INSTALL_DEST}"
COMPONENT melatonin_perfetto)

Expand Down Expand Up @@ -168,6 +168,8 @@ option(MP_TESTS "Build the melatonin_perfetto tests" "${MelatoninPerfetto_IS_TOP
if (MP_TESTS)
enable_testing()

set(CTEST_OUTPUT_ON_FAILURE ON)

add_subdirectory(tests)

if (MelatoninPerfetto_IS_TOP_LEVEL)
Expand Down
File renamed without changes.
File renamed without changes.
Loading