Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

COMP: Flags again #69

Merged
merged 2 commits into from
Nov 22, 2024
Merged

COMP: Flags again #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70252b8
COMP: Flags again
cookpa Nov 22, 2024
48f9ad2
COMP: Fix mac test
cookpa Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions configure
View file
Open in desktop
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
Loading