From 23914a7ab9c03537c591823e86f12ee0fe8f855c Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Fri, 22 Nov 2024 13:13:14 -0500 Subject: [PATCH] COMP: Flags again (#69) Fix if statements that returned true even if not on Mac --- configure | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure b/configure index e3e9ae5768..ff74fb6947 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ CXX_STD=CXX17 JTHREADS=4 -if [[ `uname` -eq Darwin ]] ; then +if [[ `uname` == 'Darwin' ]] ; then CMAKE_BUILD_TYPE=Release fi if [[ $TRAVIS -eq true ]] ; then @@ -56,10 +56,9 @@ echo "ITK;${itktag}" >> ../data/softwareVersions.csv echo "ITKURL;${itkgit}" >> ../data/softwareVersions.csv mkdir -p itkb cd itkb -compcflags=" -fPIC -O2 -Wno-c++11-long-long " -compcxxflags=" ${compcflags} -stdlib=libc++ " -if [[ `uname` -eq Darwin ]] ; then - compcxxflags=" ${compcflags} -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1 " +compflags=" -fPIC -O2 -Wno-c++11-long-long " +if [[ `uname` == 'Darwin' ]] ; then + compflags=" ${compflags} -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1 -stdlib=libc++ " fi cmaker=`${R_HOME}/bin/Rscript -e "x=Sys.which('cmake'); cat(x)"` if [[ -z "${cmaker}" ]]; then @@ -79,8 +78,8 @@ ${cmaker} \ -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DCMAKE_CXX_STANDARD="17"\ -DCMAKE_CXX_STANDARD_REQUIRED="YES"\ - -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} ${compcflags} -DNDEBUG "\ - -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${compcxxflags} -DNDEBUG "\ + -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} ${compflags} -DNDEBUG "\ + -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${compflags} -DNDEBUG "\ -DITK_USE_GIT_PROTOCOL:BOOL=OFF \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_TESTING:BOOL=OFF \