From c1ecadb55f86844683113cea54073309b6468585 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 12 Feb 2024 16:35:38 -0500 Subject: [PATCH] don't set ldflags --- configure | 3 ++- tools/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3b4413a..b1ecb52 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ EXTRACXXFLAGS=$(echo "$RCXX"| sed -e "s/-std=[^ ]\{0,\}//") CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config --cppflags` CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` -LDFLAGS=`"${R_HOME}/bin/R" CMD config --ldflags` +R_LDFLAGS=`"${R_HOME}/bin/R" CMD config --ldflags` FC=`"${R_HOME}/bin/R" CMD config FC` FLIBS=`"${R_HOME}/bin/R" CMD config FLIBS` @@ -36,5 +36,6 @@ $CMAKE ../tools \ -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_CXX_COMPILER="$CXX" \ -DR_HOME="$R_HOME" + -DR_LDFLAGS=$R_LDFLAGS echo "" >> _deps/highfive-src/include/highfive/bits/H5Friends.hpp diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index b030de7..09d1dce 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -32,6 +32,8 @@ find_package(R REQUIRED) add_library(RcppPlanc SHARED "${PROJECT_SOURCE_DIR}/../src/rcppplanc_nmf.cpp" "${PROJECT_SOURCE_DIR}/../src/RcppExports.cpp" "${PROJECT_SOURCE_DIR}/../src/conversion.cpp" "${PROJECT_SOURCE_DIR}/../src/common/detect_blas.c" $<$:${PROJECT_SOURCE_DIR}/../src/RcppPlanc-win.def>) if(WIN32) target_link_options(RcppPlanc PRIVATE -static-libgcc $<$:-s> $<$:-s>) +else() + target_link_directories(RcppPlanc PRIVATE ${R_LDFLAGS}) endif() set_target_properties(RcppPlanc PROPERTIES PREFIX "") if(APPLE)