Skip to content

Commit

Permalink
Merge pull request #151 from ImJimmi/JUCE-CPM
Browse files Browse the repository at this point in the history
Use CPM to fetch JUCE
  • Loading branch information
ImJimmi authored Jul 30, 2024
2 parents 7056341 + 03d1b0e commit 6e428bc
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ include(cmake/jive_options.cmake)
include(cmake/jive_code_coverage.cmake)
include(cmake/jive_compiler_and_linker_options.cmake)

if (JIVE_BUILD_TEST_RUNNER OR JIVE_BUILD_DEMO_RUNNER)
if (JIVE_BUILD_BENCHMARKS OR JIVE_BUILD_DEMO_RUNNER OR JIVE_BUILD_TEST_RUNNER)
include(CTest)
add_subdirectory(runners/libraries)
include(cmake/CPM.cmake)
endif()

add_subdirectory(jive_components)
Expand Down
24 changes: 24 additions & 0 deletions cmake/CPM.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# SPDX-License-Identifier: MIT
#
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors

set(CPM_DOWNLOAD_VERSION 0.40.1)
set(CPM_HASH_SUM "117cbf2711572f113bab262933eb5187b08cfc06dce0714a1ee94f2183ddc3ec")

if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
elseif(DEFINED ENV{CPM_SOURCE_CACHE})
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
else()
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
endif()

# Expand relative path. This is important if the provided path contains a tilde (~)
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)

file(DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
)

include(${CPM_DOWNLOAD_LOCATION})
20 changes: 12 additions & 8 deletions runners/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
if (JIVE_BUILD_BENCHMARKS)
add_subdirectory(benchmarking)
endif()
if (JIVE_BUILD_BENCHMARKS OR JIVE_BUILD_DEMO_RUNNER OR JIVE_BUILD_TEST_RUNNER)
CPMAddPackage("gh:juce-framework/JUCE#8.0.1")

if (JIVE_BUILD_DEMO_RUNNER)
add_subdirectory(demo-runner)
endif()
if (JIVE_BUILD_BENCHMARKS)
add_subdirectory(benchmarking)
endif()

if (JIVE_BUILD_DEMO_RUNNER)
add_subdirectory(demo-runner)
endif()

if (JIVE_BUILD_TEST_RUNNER)
add_subdirectory(test-runner)
if (JIVE_BUILD_TEST_RUNNER)
add_subdirectory(test-runner)
endif()
endif()
1 change: 0 additions & 1 deletion runners/libraries/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion runners/libraries/JUCE
Submodule JUCE deleted from 46c2a9

0 comments on commit 6e428bc

Please sign in to comment.