Skip to content

Commit

Permalink
some rcheck fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
theAeon committed Feb 16, 2024
1 parent c6d2bb0 commit 22cbb38
Show file tree
Hide file tree
Showing 6 changed files with 1,057 additions and 1,016 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ $CMAKE ../tools \
-DCMAKE_C_COMPILER="$CC" \
-DCMAKE_CXX_COMPILER="$CXX" \
-DR_HOME="$R_HOME"
#echo "" >> _deps/highfive-src/include/highfive/bits/H5Friends.hpp
echo "" >> _deps/highfive-src/include/highfive/bits/H5Friends.hpp
2 changes: 1 addition & 1 deletion configure.ucrt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ cmake ../tools \

mv Makefile Makefile.ucrt

#echo "" >> _deps/highfive-src/include/highfive/bits/H5Friends.hpp
echo "" >> _deps/highfive-src/include/highfive/bits/H5Friends.hpp
7 changes: 3 additions & 4 deletions tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,10 @@ add_library(hw_detect OBJECT "${PROJECT_SOURCE_DIR}/../src/common/hw_detect.c")
URL https://download.open-mpi.org/release/hwloc/v2.9/hwloc-2.9.3.tar.gz
URL_HASH SHA256=5985db3a30bbe51234c2cd26ebe4ae9b4c3352ab788b1a464c40c0483bf4de59
PATCH_COMMAND ${CMAKE_COMMAND} -E cat ${hwloc_patch_list} | ${PATCH} -p1 -l
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env "CFLAGS= -Wno-comment -DNDEBUG $ENV{CFLAGS} $<$<BOOL:${APPLE}>:-mmacosx-version-min=11>" sh ../hwloc/configure --with-pic --prefix=${hwloc_SOURCE_DIR}/out/ --disable-picky --enable-shared=no --enable-static=yes
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env "CFLAGS= -DNDEBUG $ENV{CFLAGS} $<$<BOOL:${APPLE}>:-mmacosx-version-min=11>" sh ../hwloc/configure --with-pic --prefix=${hwloc_SOURCE_DIR}/out/ --disable-picky --enable-shared=no --enable-static=yes
--disable-cairo --disable-libxml2 --disable-io --disable-plugin-dlopen --disable-plugin-ltdl --enable-embedded-mode $<$<BOOL:${WIN32}>:--build=x86_64-w64-mingw32>
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
LIST_SEPARATOR " "
VERSION 2.9.3
)
ExternalProject_Get_Property(hwloc SOURCE_DIR BINARY_DIR)
target_include_directories(hw_detect PRIVATE "${BINARY_DIR}/include" "${SOURCE_DIR}/include")
Expand All @@ -148,8 +147,8 @@ if(WIN32)
endif()
FetchContent_Declare(
HighFive
GIT_REPOSITORY https://github.com/BlueBrain/HighFive.git
GIT_TAG v2.9.0
URL https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.9.0.tar.gz
URL_HASH SHA256=6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e
)
FetchContent_MakeAvailable(HighFive)
if(WIN32)
Expand Down
Loading

0 comments on commit 22cbb38

Please sign in to comment.