Skip to content

Commit

Permalink
COMP: Flags again (#69)
Browse files Browse the repository at this point in the history
Fix if statements that returned true even if not on Mac
  • Loading branch information
cookpa authored Nov 22, 2024
1 parent 26795d0 commit 23914a7
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit 23914a7

Please sign in to comment.