Skip to content

Commit

Permalink
add one path per external project
Browse files Browse the repository at this point in the history
  • Loading branch information
CamilaDuitama committed Jan 21, 2025
1 parent ce97f23 commit e265b3d
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 81 deletions.
14 changes: 14 additions & 0 deletions recipes/muset/external_project_fmt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- a/cmake/fmt.cmake
+++ b/cmake/fmt.cmake
@@ -2,10 +2,11 @@

ExternalProject_Add(FMT
PREFIX ${external_bindir}/FMT
SOURCE_DIR ${external_dir}/fmt
DOWNLOAD_COMMAND ""
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing fmt library"
LOG_CONFIGURE ON
LOG_BUILD ON
)
16 changes: 16 additions & 0 deletions recipes/muset/external_project_kff.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- a/cmake/lz4.cmake
+++ b/cmake/lz4.cmake
@@ -2,13 +2,14 @@

ExternalProject_Add(LZ4
PREFIX ${external_bindir}/LZ4
SOURCE_SUBDIR build/cmake
SOURCE_DIR ${external_dir}/lz4
DOWNLOAD_COMMAND ""
CMAKE_ARGS -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing lz4 library"
LOG_CONFIGURE ON
LOG_BUILD ON
)
16 changes: 16 additions & 0 deletions recipes/muset/external_project_lz4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- a/cmake/lz4.cmake
+++ b/cmake/lz4.cmake
@@ -2,13 +2,14 @@

ExternalProject_Add(LZ4
PREFIX ${external_bindir}/LZ4
SOURCE_SUBDIR build/cmake
SOURCE_DIR ${external_dir}/lz4
DOWNLOAD_COMMAND ""
CMAKE_ARGS -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing lz4 library"
LOG_CONFIGURE ON
LOG_BUILD ON
)
15 changes: 15 additions & 0 deletions recipes/muset/external_project_spdlog.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/cmake/spdlog.cmake
+++ b/cmake/spdlog.cmake
@@ -2,11 +2,12 @@

ExternalProject_Add(SPDLOG
PREFIX ${external_bindir}/SPDLOG
SOURCE_DIR ${external_dir}/spdlog
DOWNLOAD_COMMAND ""
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DSPDLOG_BUILD_SHARED=OFF
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing spdlog library"
LOG_CONFIGURE ON
LOG_BUILD ON
)
16 changes: 16 additions & 0 deletions recipes/muset/external_project_xxhash.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- a/cmake/xxHash.cmake
+++ b/cmake/xxHash.cmake
@@ -2,12 +2,13 @@

ExternalProject_Add(XXHASH
PREFIX ${external_bindir}/XXHASH
SOURCE_SUBDIR "cmake_unofficial"
SOURCE_DIR ${external_dir}/xxHash
DOWNLOAD_COMMAND ""
CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DBUILD_SHARED_LIBS=OFF
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Using existing xxHash library"
LOG_CONFIGURE ON
LOG_Build ON
)
79 changes: 0 additions & 79 deletions recipes/muset/external_projects.patch

This file was deleted.

8 changes: 6 additions & 2 deletions recipes/muset/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ source:
url: https://github.com/CamilaDuitama/muset/archive/v{{ version }}.tar.gz
sha256: 0f924e44e2af25397147e40934e024180a8b65c715750f2e9aacdb72fedeb600
recursive: True
patches:
- external_projects.patch
patches:
- external_project_fmt.patch
- external_project_kff.patch
- external_project_lz4.patch
- external_project_spdlog.patch
- external_project_xxhash.patch

build:
number: 0 # Reset build number to 0
Expand Down

0 comments on commit e265b3d

Please sign in to comment.