Skip to content

Commit 941d128

Browse files
authored
COMP: Extra flags only for Mac CXX (#70)
* COMP: Set OSX sysroot
1 parent 23914a7 commit 941d128

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

configure

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@ echo "ITK;${itktag}" >> ../data/softwareVersions.csv
5656
echo "ITKURL;${itkgit}" >> ../data/softwareVersions.csv
5757
mkdir -p itkb
5858
cd itkb
59-
compflags=" -fPIC -O2 -Wno-c++11-long-long "
59+
compcflags=" -fPIC -O2 -Wno-c++11-long-long "
60+
compcxxflags=" ${compcflags} "
61+
osx_sysroot=""
6062
if [[ `uname` == 'Darwin' ]] ; then
61-
compflags=" ${compflags} -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1 -stdlib=libc++ "
63+
osx_sysroot=$(xcrun --sdk macosx --show-sdk-path)
6264
fi
6365
cmaker=`${R_HOME}/bin/Rscript -e "x=Sys.which('cmake'); cat(x)"`
6466
if [[ -z "${cmaker}" ]]; then
@@ -78,8 +80,9 @@ ${cmaker} \
7880
-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
7981
-DCMAKE_CXX_STANDARD="17"\
8082
-DCMAKE_CXX_STANDARD_REQUIRED="YES"\
81-
-DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} ${compflags} -DNDEBUG "\
82-
-DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${compflags} -DNDEBUG "\
83+
-DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} ${compcflags} -DNDEBUG "\
84+
-DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${compcxxflags} -DNDEBUG "\
85+
-DCMAKE_OSX_SYSROOT="${osx_sysroot}"\
8386
-DITK_USE_GIT_PROTOCOL:BOOL=OFF \
8487
-DBUILD_SHARED_LIBS=OFF \
8588
-DBUILD_TESTING:BOOL=OFF \

0 commit comments

Comments
 (0)