Fix build against Slicer using Qt4 and improve build-system#40
Merged
juanprietob merged 13 commits intoNIRALUser:masterfrom Sep 11, 2018
Conversation
…R if set Logic adapted from https://github.com/QIICR/dcmqi
jcfr
referenced
this pull request
in Slicer/ITK
Sep 6, 2018
…rsion 3.1
This commit fixes build errors (see below) about missing atomic header
reported on macOS 10.6 when using clang version 3.1.
Build error:
In file included from /Users/kitware/Dashboards/Stable/S-481-E-b/DTIProcess/PrivateLibrary/tensorscalars.cxx:1:
In file included from /Users/kitware/Dashboards/Stable/S-481-E-b/DTIProcess/PrivateLibrary/tensorscalars.h:4:
In file included from /Users/kitware/Dashboards/Stable/S-481-E-b/DTIProcess/PrivateLibrary/dtitypes.h:5:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkImage.h:21:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkImageRegion.h:31:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkRegion.h:31:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkObject.h:31:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkLightObject.h:23:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkTimeStamp.h:33:
In file included from /Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkAtomicInt.h:38:
/Users/kitware/Dashboards/Package/Slicer-481-package/ITKv4/Modules/Core/Common/include/itkAtomicIntDetail.h:42:11: fatal error: 'atomic'
file not found
^
$ /Users/kitware/Dashboards/Support/clang+llvm-3.1-x86_64-apple-darwin11/bin/clang++ --version
clang version 3.1 (tags/RELEASE_31/final)
Target: x86_64-apple-darwin10.8.0
Thread model: posix
See also http://slicer-devel.65872.n3.nabble.com/MacOSX-factory-build-Transitioning-from-hybrid-quot-llvm-g-quot-to-quot-clang-quot-Update-to-Qt-4-8-6-tt4032198.html#a4032199
Change-Id: If72e44f76ebbc2f4006917318f1540c973e8a469
Reported-by: Juan Carlos Prieto <Juanprietob@gmail.com>
Contributor
Author
|
The build manually triggered completed and the macOS extension has been uploaded.
That said, the build system need to be updated ... similar to what I did for https://github.com/NIRALUser/SPHARM-PDM Look like there is an overlap |
Since the target property LOCATION is not guaranty to default to the Release configuration when building using multi-configuration generator, this commit explicitly specifies LOCATION_RELEASE. Fixes NIRALUser#42
Check for style should instead be delegated to a Continuous Integration system. Change adapted from NIRALUser/SPHARM-PDM@752a5f6
Note that DTI_Tract_Stat is already built as a Slicer extension under the name DTIAtlasFiberAnalyzer and depends on DTIProcess
This external project corresponds to DTIProcessToolkit (this project)
This commit fixes the following warning:
/tmp/DTIProcessToolkit/Applications/tio.cxx:130:8: warning: variable ‘sourceSet’ set but not used [-Wunused-but-set-variable]
bool sourceSet = false;
^
This commit fixes the following warning:
/tmp/DTIProcessToolkit/Applications/fiberstats.cxx:58:35: warning: typedef ‘VoxelMapValue’ locally defined but not used [-Wunused-local-typedefs]
typedef VoxelMap::value_type VoxelMapValue;
^
Contributor
|
Thank you so much for this update |
jcfr
deleted the
fix-build-against-Slicer-built-with-Qt4--and-improve-build-system
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.