/[Slicer4]/branches/Slicer-4-4/CMakeLists.txt
ViewVC logotype

Log of /branches/Slicer-4-4/CMakeLists.txt

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (annotate)
Sticky Revision:

Revision 23777 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 4 11:24:07 2014 UTC (2 years, 11 months ago) by jcfr
File length: 45946 byte(s)
Diff to previous 23774
ENH: Branching from trunk to Slicer-4-4 at r23774

Revision 23774 - (view) (download) (annotate) - [select for diffs]
Modified Sun Nov 2 21:58:30 2014 UTC (2 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45946 byte(s)
Diff to previous 23769
ENH: Slicer 4.4.0

Revision 23769 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 30 18:30:30 2014 UTC (2 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45947 byte(s)
Diff to previous 23766
COMP: Ensure vtk FreeTypeFontConfig component is consistently specified.

This commit fixes an inconsistency between

- External_VTKv6.cmake where the component was build only if FontConfig
was found.

and

- CMakeLists.txt where the VTK component was systematically expected.

This commit now makes sure that "find_package(FontConfig QUIET)" is
systematically used.

Co-authored-by: Dzenan Zukic <dzenan.zukic@kitware.com>

Revision 23766 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 30 08:50:26 2014 UTC (2 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45867 byte(s)
Diff to previous 23755
BUG: Use Slicer VTK components in SlicerConfig. Fixes #3872

This commit revert r23755 and ensure extension will find only the
VTK components required by Slicer itself.

Revision 23755 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 28 22:12:21 2014 UTC (2 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45893 byte(s)
Diff to previous 23730
BUG: Ensure vtkGUISupportQtOpenGL is packaged on MacOSX. Fixes #3872

This commit add vtkGUISupportQtOpenGL to the VTK component list so that
it show up as a dependency when fixup script are used to create the MacOSX
package.

This is required because "find_package(VTK..)" is used in SlicerConfig.cmake
without specifying a list of component and the complete list of VTK libraries
is used to build extensions.

Ideally, the same list of components should also be used when calling
find_package(VTK ...) from SlicerConfig.

Revision 23730 - (view) (download) (annotate) - [select for diffs]
Modified Thu Sep 25 19:56:17 2014 UTC (3 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45867 byte(s)
Diff to previous 23684
ENH: Add option Slicer_ITKV3_COMPATIBILITY. See #3825

This option enabled by default will allow (if disabled) to build Slicer
with ITKv3 compatibility later disabled and ITK_USE_64BITS_IDS enabled.

Co-authored-by: Bradley Lowekamp <blowekamp@mail.nih.gov>

Revision 23684 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 16 03:28:40 2014 UTC (3 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45701 byte(s)
Diff to previous 23622
BUG: Fix OtsuThresholdImageFilterTest on Windows

This commit ensures that "SEM_LAUNCH_COMMAND" variable will be defined
for both CLIs and remote modules.

Revision 23622 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 26 23:41:20 2014 UTC (3 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45485 byte(s)
Diff to previous 23528
BUG: Update version of VTK to use VTK_ENABLE_KITS.  Issue #3809

This commit updates to the latest version of VTK including Slicer
specific patches (branch: slicer-v6.2.0-7167ad1_2014-08-21)

Additionally:
* Update VTK to include kit support for VTK python modules.
* Tweak vtkMacroKitPythonWrap to consider VTK kits.
* Enable VTK_ENABLE_KITS only if CMake >= 3
* Explicitly specify vtkRenderingContextOpenGL. Basically following
kitware/VTK@c5121871,  the OpenGL override for vtkContextDevice2D has been
moved int Rendering/ContextOpenGL, we have to make sure that we link
to vtkRenderingContextOpenGL.  See [1] for more info.

[1] http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Factories_now_require_defines

// --------------------------------
$ git shortlog df24b795..e59c76c --no-merges
Ben Boeckel (1):
      python: split wrapping functions

Jean-Christophe Fillion-Robin (5):
      python: Add wrapping of kits if VTK_ENABLE_KITS is ON
      modules: Re-order RenderingOpenGL libraries to fix VTK_ENABLE_KIT link error
      python: Update python module dependency to account for VTK_ENABLE_KITS
      python: Configure PythonInit file for kit when VTK_ENABLE_KITS is ON
      python: Add VTK_ENABLE_KITS to VTKConfig

// ---------------------------------
$ git shortlog slicer/slicer-v6.1.0..df24b795 --no-merges

Andrew Bauer (8):
      Need to check for static targets before adding abi visibility flags.
      Composite data writers weren't passing down the HeaderType info.
      Passing missing parallel writer options to piece writers.
      Fixing overflow issue that appeared with GCC compilers.
      Fix the way point and cell data arrays are marked for reading.
      Adding in arctan2 through numpy.
      Adding the ability to not delete the passed in arrays.
      Fixed memory leak in test and added in comments for clarification.

Andrew Maclean (8):
      Remove WindowLevelInterface.tcl and WindowLevelInterface.py
      Revert Remove WindowLevelInterface.tcl and WindowLevelInterface.py
      Sphere widget behaves better when scaled down to zero
      ENH: VTK Parametric surfaces - modernised the code.
      ENH: Remove the need to manually regenerate the hill data.
      DOC: Update vtkRandomHills documentation.
      BUG: Fix by adding a new keyword.
      ENH: Add option to return an ordinal lookup table.

Antonio Cervone (1):
      Fixed the BiQuadraticQuad interpolator

Ben Boeckel (117):
      STLWriter: Raise an error for non-triangles
      STLReader: Close the file when an error occurs
      ExodusIIReader: Add the title to the field data
      STLReader: Fix error signaling when reading files
      AVIWriter: Don't overflow the fourcc storage
      AVIWriter: Fix a comment typo
      Exodus: Always attach the title to the output fields
      Rewrite the testing macros
      Update the Cxx test call sites
      Update the MPI test call sites
      Update the Python test call sites
      Update Tcl test call sites
      Minor CMake logic simplification
      Copy Statistics tests to StatisticsGnuR
      Infovis: Add an include for newer Boost versions
      ParallelMPI: Add missing return statement
      Allow arguments to be passed directly to Python
      Skip adding the executable if no tests are created
      Allow for overriding the data directory in tests
      Allow overriding the baseline directory in tests
      Build the VTK test data directory properly
      Support custom baselines in tests
      Store VTK's ExternalData in its source directory
      Support VTKExternalData_OBJECT_STORES as well
      Support custom ExternalData targets for tests
      Support flags to tests common at the module level
      Support JUST_VALID for Python tests
      Support Python+MPI testing
      Use VTK_TEST_OUTPUT_DIR rather than rebuilding the path
      examples: Fix typo in testing calls
      ParallelGeometry: Fix Grid symbol scoping
      testing: Use vtk-example as a fallback for prefix
      Fix test function signatures
      testing: Don't look for tests when making an executable
      FiltersGeometry: Remove unnecessary links
      Filters/Geometry: Remove some unused functions from tests
      Filters/Geometry: Hide WriteGrid if ENABLE_IO isn't on
      testing: add some missing TEST_DEPENDS
      pythoncore: extract python objects from arguments
      wrapping: add function to check for Python objects
      wrapping: wrap PyObject* in python code
      python: accept any argument for PyObject* arguments
      vtkAlgorithm: fix a typo
      FiltersPython: create a vtkPythonAlgorithm class
      python: fix leaks when setting constants in wrappers
      vtkPythonAlgorithm: support older pythons
      vtkpython: add site-packages to the path
      vtkFiltersPython: Disable without Python wrapping
      wrapping: add variables to exclude from language-specific wrapping
      vtkFiltersPython: exclude from Java and Tcl wrapping
      java: get the list of java modules properly
      testing: append the tests to the given variable
      pythonalg: use keyword arguments rather than members
      pythonalg: raise an error in RequestData by default
      wrapping: remove the ${module}_WRAP_PYTHON variable
      vtkStructuredImplicitConnectivity: fix msvc warnings
      typo: fix some typos
      unused: remove unused functions
      mpi4py: add module information
      mpi4py: link to CMAKE_DL_LIBS
      testing: skip test executables with no tests
      IOVPIC: include MPI headers as SYSTEM headers
      cmake: set policy 0053 if available
      cmake: set policy 0053 in thirdparty cmake
      mpi4py: add a class to convert communicators
      wrapping: check for Tcl wrapping exclusion for warnings
      vtkAMRUtilities: split out vtkParallelAMRUtilities
      hierarchy: use a .txt extension
      GenerateExportHeader: support object libraries as well
      vtk_module: support a KIT argument
      modules: add modules to "kits"
      linking: wrap tll() with a module-aware function
      export: OBJECT libraries may not be exported
      modules: output kit information in the module tree
      modules: topo-sort modules with kits as well
      modules: build kits from the member modules
      module: depend on the dependent module object library
      python: add an option to disable vtkpython
      testing: check for pvtkpython before using it
      vtkpython: don't install if not enabled
      vtkAVIWriter: make a more informative error message
      IO/Geometry: add obj index tests
      FiltersParallelGeometry: move functions to the sources
      vtkMPICommunicator: avoid deprecated MPI functions
      vtkInstantiator: remove instantiator macro from main sources
      typo: remove duplicate source listing
      vtkCompositePolyDataMapper2: cache opacity check
      vtkCompositePolyDataMapper2: include <algorithm> for std::max
      vtkCompositePolyDataMapper2: avoid a NULL dereference
      OpenGL: use STATUS for the OSMesa message
      vtkPStreamTracer: conditionalize functions
      vtkPTemporalStreamTracer: remove useless code
      unused: add a macro to mark functions as "unused"
      vtkChartBox: initialize segmentIndex
      nit: remove extra semicolon
      vtkMPI: install so that vtk_mpi_link is available
      python: install packages properly
      opengl2: use STATUS for the OSMesa message
      Maintenance: recognize the KIT keyword in scripts
      module: add comment to update maintenance scripts too
      Maintenance: recognize language exclusion keywords
      warnings: fix narrowing warnings
      TestSurfacePlot: loop using vtkIdType
      vtkQuaternionInterpolator: call the constructor properly
      warnings: remember values with the proper type
      warnings: use static casts to point out precision loss
      warnings: use floating point intermediate values
      warnings: resolve unused variables
      vtkOpenGLImageMapper: fix unintentional shadowing
      warnings: fix signed/unsigned comparison warnings
      vtkOpenGLProperty: remove unused function
      unused: use the vtkNotUsed macro
      Q4VTKWidgetPlugin: only define qDebug if not already defined
      mpi4py: use the output, not the result
      cmake: remove unnecessary condition copies
      vtkSmartPyObject: ignore warning C4127 on MSVC
      mpi4py: use old code with Python 2.6 as well

Berk Geveci (52):
      Removed priority based streaming and fast path.
      Removed unused code from vtkModelMetaData and vtkExodusModel
      COMP: Fixed compiler error - needed to remove functions from .h.
      Improved test to increase vtkDistributedDataFilter's coverage.
      Cleaned up the Exodus metadata.
      Fixed minor typo - case sensitivity issue.
      Removed verts from streaklines - lines are enough.
      Removed unnecessary recursion in pipeline streaming.
      Filter was modifying self in request. Fixed.
      Fixed minor typo in documentation.
      Added test for vtkTableBasedClipDataSet.
      Added caching to temporal interpolator.
      Fixed minor bug in the ensight gold reader.
      Added EnSight tests to increase coverage.
      Added initial ghost points support to vtkDataSetSurfaceFilter.
      PERF: Parallel streamline was slow. Fixed.
      Refactored how pieces and extents are handled.
      Update the XML readers and writers to work with pipeline changes.
      Cleaned up and fixed transmit filters for structured data.
      Fixed bug in send structured data.
      Fixed legacy parallel reader and writer.
      BUG: Was using array of wrong size.
      Fixed compiler warnings.
      Changed synchronized templates class for new pipeline behavior.
      Removed unused keys.
      Updated filters and sources to work with new pipeline logic.
      Moved key.
      Cleaned up extent translators.
      Removed unnecessary reference to extent translator
      ExtractSelection was not managing pieces corretly. Fixed.
      Filters should silently handle empty input
      Fixed multiple issues with resample/probe filters.
      Fixed contour filters
      Fixed issues in the group filter.
      Fixed crash in the empty input test.
      Fixed vtkXdmfReader for parallel structured data.
      Parallel Exodus writer was not asking for pieces. Fixed.
      Added new meta-data and request capability to the pipeline.
      PERF: Removed unnecessary function call.
      Added an ensemble source.
      Added documentation and testing to vtkPythonAlgorithm.
      Fixed no newline at end of file warnings.
      Executive was setting update extent initialized falsely.
      PERF: Removed unnecessary garbage collection.
      Fixed indentation and style to match VTK's.
      BUG: Filter was overwriting input scalars. Fixed.
      Added modules that create a numpy type interface.
      Certain MPI types were not being recognized by mpi4py.
      Improved TestNumpyInterface to cover various append implementations.
      Added sum and mean per block to Python algorithms.
      Added support for CompositeDataSet.Points.
      Fixed innaccurate comments.

Bill Lorensen (26):
      COMP: Test driver array bounds error
      BUG0013829: vtkAssembly::GetBounds adds bounds which are uninitialized
      BUG0014331: Filter skips VTK_CUBIC_LINE
      COMP: Restore TestTessellator test
      ENH: Added tests that were removed during modularization
      COMP: Refactored TestDataObjectIO
      COMP: test require NO_VALID modifier
      ENH: Add removed tests
      COMP: Improve coverage of vtkMeshQuality
      COMP: Missing NO_VALID
      ENH: Improve code coverage script
      BUG: Flawed logic for NO_OUTPUT
      COMP: Python unittest requies NO_OUTPUT
      COMP: Performance warning: int to bool
      COMP: Remove QtInitialization from otherPrint test
      ENH: Remove ThirdParty code from coverage results
      COMP: Remove bogus line info from generated files
      ENH: Unit test for ParametricSpline
      ENH: Coverage for MultiThreshold.
      BUG: CreateDefaultLookupTable crashes if Input is NULL.
      ENH: Add some more coverage for MultiThreshold
      ENH: Improve code coverage for UnicodeStringArray
      ENH: Unit test for vtkMath
      COMP: Adjust tolerances
      COMP: Guard against infinite loop in vtkClearOpenGLErrors
      ENH: Provide PlaybackFile for recorded interaction events

Brad King (35):
      COMP: Drop invalid custom commands from HDF5
      COMP: Drop missing dependencies of target 'vtkpython_pyc'
      vtkhdf5: Remove extra calls to cmake_minimum_required
      Accelerators/Dax: Remove extra call to cmake_minimum_required
      Refactor top-level CMake Policy settings as loop
      Examples: Set required CMake version and policies before project()
      Set CMake Policies CMP0025 and CMP0042 as necessary
      Rendering/Volume: Convert new baseline to ExternalData content link
      Wrapping/Tcl: Fix CMake Policy CMP0050 warnings
      IO/XML: Remove unnecessary <sstream> include
      IO/XML: Add missing <string> include
      IO/XML: Fix HeaderTest for this module
      vtkOStreamWrapper: Support std::string
      Revert "vtkOStreamWrapper: Support std::string"
      vtkOStreamWrapper: Support std::string
      Revert "vtkOStreamWrapper: Support std::string"
      vtkOStreamWrapper: Support std::string
      Allow custom TestTM3DLightComponents timeout
      Allow custom TestProp3DFollower timeout
      Honor VTK_INSTALL_NO_DEVELOPMENT for archive libraries
      Use vtkMPI.cmake helper for all module MPI tests
      Set MACOSX_RPATH property default consistently across CMake versions
      ExternalData: Add backtrace to missing file warning
      Export the locations of Qt5 packages on which modules depend
      Allow configuration of external module dependency locations
      Views/Infovis: Add another baseline for TestConeLayoutStrategy
      Allow custom Interaction/Widgets test timeouts
      Fix ExternalData pre-commit hook on msysGit
      Add option to exclude VTKData target from default build
      mpi4py: Suppress warnings in third-party code
      vtkFFMPEGWriter: Fix build with libavcodec55
      Exclude classes requiring a QApplication from VTK smoke tests
      module: fix export macros with kits
      vtkglew: Install glew header files
      IO/ADIOS: Exclude module from VTK_BUILD_ALL_MODULES

Burlen Loring (1):
      surface LIC - stl and NULL

Chris Harris (22):
      Add failure filter to session.auth(...) deferred
      Add error function to vtk:mouseInteraction RPC
      vtkWeb: Add newline to end of each proxy map entry
      vtkWeb: Teach launcher.py to wait for ready_line
      vtkWeb: Add appropriate error codes for launch requests
      vtkWeb: Don't reset viewer to null on updateViewer(...)
      vtkWeb: Propagate mouse events to VGL
      vtkWeb: Fix calls to old VGL API
      vtkWeb: Rename ogs.vgl => vgl
      Rename md5 => sceneMD5 to avoid confusion
      Update canvas size before creating viewer
      Prevent mouse event handlers be bound multiple times
      Update VGL to master
      Update version of VGL
      Prevent scene and clipping range from being reset
      Update VGL to lastest version
      vtkWeb: Refactor fetchObject(..) to use cached objects
      Add code to clean of VGL actor cache
      Add missing initialization of member
      Fix typo introduce by 06aaa805 session => m_session
      Update to modern CMake style
      Allow location of OSMesa install to be specified

Chuck Atkins (1):
      Initial ADIOS readers and writers

Cory Quammen (7):
      BUG: Fix build failure in RenderingParallelLIC on Intel compiler
      Added "sticky" axes mode to vtkCubeAxesActor
      Fixed linkage problem in Windows
      Improved comment handling
      KW00001404: Major overhaul of vtkAppendFilter
      Fixed memory leak and improper erasing of std::set elements
      Fixed error in appending cell data

Dan Lipsa (9):
      Report an error when writing a file with changing topology.
      Update documentation.
      Remove debugging printouts.
      Name enum LEFT, BOTTOM, ... Location.
      Add component-wise set functions for Border and Gutter (vtkChartMatrix)
      Set Bold and Italic axis label properties for ScatterPlotMatrix.
      vtkMultiProcessStream: Add insert and extract operators for bool
      Fix Windows compilation warning.
      Forces the compiler to convert a char* to a string rather than a bool.

Dave DeMarle (35):
      Increment version to VTK 6.2.0
      Add a test for the VPIC reader
      document arguments to test macros
      move dashboard management scripts into better place
      fix link errors that happened when I turned on InfovisParallel
      deprecate this module
      fix a compilation warning
      make rubber band look correct on scenes with textures
      optimize geojson writer
      more optimization of geojson writer
      fix variety of dashboard problems
      Put libxdmf into a namespace so that libxdmf3 can coincide with it.
      Adapt libxdmf to build within VTK.
      add cmakescript infrastructure to make libxdmf a VTK module
      Add a reader and writer for the new xdmf library.
      Fixes for xdmf3 regression test data.
      Fix issues the dashboards turned up.
      Fix more issues the dashboards turned up.
      Really fix on of the issues the dashboards turned up
      Fix a regression in the xdmf bump
      STYLE: improve comments and organize internal classes
      fix a case of discarded arrays
      Remove stray debugf.
      bring back subsets
      put array reuse in
      Fix dashboard warnings and test failure.
      disable a balky test until we can fix it
      Add file series reading and top level spatial partitioning
      fill in time varying graphs
      STYLE: pull helpers out and format all for vtkstyle
      move strict partition multipiece constuction out to reader level
      disable oggtheora on cray too
      Fix problems that the dashboards turned up.
      remove MetaIO to replace with updated content
      exclude matlab from the "all" modules set

David C. Lonie (14):
      Tie vtkUnstructuredGridBase into the dataset type system.
      Update baseline
      Handle empty array initialization in numpy_support.
      Don't reset traversal location in each iteration of box clip filter.
      Process facestream in vtkExtractUnstructuredGridPiece::RequestData.
      Handle polyhedra in vtkUnstructuredGridWriter.
      Disable FP frame buffer when GL_ARG_texture_float is not present.
      Return early if ProjectedTetrahedra volume rendering is unsupported.
      Add new baseline for rendering without floating point buffers.
      Add new baseline for dashlin1.
      Pass std::strings through the OStreamWrapper.
      Revert "Pass std::strings through the OStreamWrapper."
      Return early in TransformPoints if input is NULL.
      Update system font test baseline.

David Cole (6):
      Add a vtkMath method to compute the angle between two vectors
      Tests: Re-activate the old TestResliceCursorWidget tests
      Tests: Add test for the vtkCornerAnnotation class
      - Follow on commit to use the right style #include ("", not <>)
      BUG: Add missing header files to enable try_run tests to run without crashing
      Testing: Call SetMultiSamples(0) from tests

David Gobbi (19):
      14196: Allow unicode path in vtkLoadPythonTkWidgets.py.
      In wrappers, guard against #including dirs.
      Fix cell picker for images with negative spacing.
      Fix uninitialized array warnings.
      Fix unreachable code warning in otherCellTypes.cxx.
      Fix a crash when deleting vtk-python objects.
      Fix bad SetColor/GetColor interaction in vtkProperty.
      Fix the extent for tiled tiff files.
      Two fixes for certain lsm (zeiss) tiff images.
      Add reader/writer for NIFTIv1 and NIFTIv2 files.
      Add SetSlabModeToSum() to vtkImageResliceMapper.
      Clean up vtkMedicalImageProperties PrintSelf.
      NIFTI makes IOImage module depend on vtkzlib.
      Fix warning about trailing comma in enum list.
      Bad null pointer check in vtkBSplineTransform.
      Fix segfault if vtkImageWeightedSum's inputs don't match.
      Rewrite the comments for vtkDataArray::GetRange.
      Add generic PyObject support to vtkPythonOverload.
      Provide a method to set the sample spacing for slab modes.

David Stoup (1):
      Add multi-layer support to the vgl interface.

David Thompson (6):
      Bug 14713: Read LS-Dyna point coordinates properly.
      Add a regression test for bug 14713.
      Small fixes to docs, comments, and formatting.
      Add support for reading polyhedra.
      Test reading a polyhedral Exodus dataset.
      Add test data with multiple polyhedra.

Eli Kahn (4):
      Adding mousewheel support to Java GUI components.
      Fix java code formatting.
      Add java file to generated jar file.
      In java code, handle situation when wheel rotation value is zero.

Georg Hammerl (1):
      Add caching for time steps in EnSightGoldReader binary reader.

George Zagaris (18):
      Disable I/O in TestStructuredAMRGridConnectivity
      ENH: DuplicateNodes property to RCB partitioners
      BUGFIX: Fix integer overflow in vtkStructuredData
      ENH: FieldData deserialization to a subextent
      ENH: Add blanking to vtkXMLUniformGridAMRReader
      ENH: Implicit structured data connectivity
      COMP: Update vtkFiltersParallelMPI tests
      ENH: Rename nodes to points in vtkStructuredData
      BUGFIX: Add guards for NULL ivars in PrintSelf
      BUGFIX: Fix issue with unigrid enzo datasets
      COMP: Correct ParallelMPI module test dependencies
      COMP: Remove HyperTreeGridGeometry::UpdateExtent()
      ENH: Update extract structured data filters
      ENH: Use vtkImageData in implicit connectivity
      ENH: RectilinearGrid implicit connectivity support
      ENH: MPI structured data extraction filters
      COMP: Fix a few compiler warnings
      ENH: Added broadcast implementation for RMI triggers

Jacob Becker (1):
      Fix bad check for incomplete polygons, fix div-by-zero.

Jameson Merkow (1):
      Add files, and made modifications for MatlabMex to wotk in vtk 6

Jean-Christophe Fillion-Robin (3):
      vtkPythonCommand - Add support for additional call data types
      vtkPythonCommand - Fix indent and variable names
      Configure VTKConfigVersion consistent with VTK's compatibility guarantees

Jeffrey Baumes (1):
      Fixing array bounds issue

Joachim Pouderoux (19):
      Introduce Robust PCA.
      Introduce box plot and the corresponding chart.
      Introduce Compute Quartiles filter to generate box plots tables.
      Enhance bag plot API to allow specify line and points properties.
      Fix bag plot legends.
      Fix black box plots issue.
      Fix double to unsigned char cast error on clang compiler.
      Fix bag plot and functional bag plots tests.
      Fix and enhance the box plot and chart
      Fix and enhance bag plots.
      Fix bug in picking of invisible props in an assembly.
      Clean an enhance hypertree grids.
      Fix potential compiler error with ternary operator.
      Replace a verbose cout by a vtkDebugMacro()
      Fix clang errors on array initialization
      Fix and clean vtkWin32OpenGLRenderWindow class.
      Fix functional bag plot.
      Clean and uniformize vtkPoints & vtkPoints2D.
      Fix crash on normal computation when polygon is empty.

John Stark (2):
      Add a test for vtkImageImport / vtkImageExport
      Fix pipeline update issues in vtkImageExport

Jorge Perez (1):
      Upgrading the Tcl examples wrt. VTK 6.x

Julien Finet (4):
      Prevent error message when deep copying vtkGridTransform
      Change GetInputConnection error message into a debug warning message
      Enable GPU Raycast volume mapper for recent NVIDIA drivers on Mac OS X
      GPU raycast volume rendering now supports textures larger than 1024

Julien Jomier (2):
      ENH: Fixes for ActiViz.Net
      BUG: Wrong transformation used to restore original parameters

KWSys Robot (1):
      KWSys 2014-03-12 (dd873734)

Ken Martin (115):
      some rough changes to the VBO polydata mapper
      some more cleanup
      added light override
      compute cam matrix, add posiitonal light in progress
      updates to support positional lights
      change how object factory is done
      some fixes to normals etc
      added ambient color in
      some module changes override actor change bunny color
      changes in normal calcs
      moved property over and started gutting it
      fix normals on test
      minor changes
      some bug fixes and start on mapper2D
      allow testing using old mapper
      bug fix
      added cxx for Helper
      duh
      many updates to 2d mapper
      bug fix
      lots of rough changes
      moved renderer over, moved init code
      in progress
      in progress cell scalars
      some cleanup and fixes
      lots of changes in progress
      more fixes
      fix array bounds issue and memory leak
      fix performance issue
      add fast path for float points no col no norm and fix bug
      started on texture mapping
      first cut a tmap support
      add textured backgrounds and fix issue with gradients
      bug fixes
      clean up a bit
      change opacity clean some texture stuff
      minor fixes
      fix crash on test
      fix crash on test
      add fragment shader lighting of lines
      support textured luts some cleanup
      some support for resolving coincident polys
      ambient color fix
      some minor fixes
      start working on image slice mapper
      add baseine images
      updated baseline images
      updated baseline image
      minor backwards compatability change
      basic ImageSliceMapper conversion
      some more fixes
      moved render window over
      bug fix in old VTK
      bunch of optimization more to come
      bad optimizations and missing classes'
      doh forgot really key line
      bug fix and minor cleanup
      fix a glyph bug and minor cleanup
      another bug fix
      better picking support some cleanup
      move interface closer to old Rendering API
      convert ImageMapper
      some bug fixes
      another valid image, remove unused test
      fix SetPixelData and fix picking issue
      add depth peeling
      make wider so we can see errors
      some win32 fixes
      rename VBO mapper
      cleaned up the mapper a bit
      minor cleanup
      minor lighting fix for intel
      handle wireframe tstrips
      some bug fixes etc
      more fixes
      more fixes
      add support for edge visibility
      modify API to be a bit more future proof
      fix some picking issues
      some fixes for andriod
      some fixes for andriod
      remove some old code
      some fixes for andriod
      more andriod glew changes
      more andriod glew changes
      many changes to support glew and android
      many changes to support glew and android
      many changes to support glew and android
      first working in quotes android app
      first working in quotes android app
      comment out more modukles by default
      some warning fixes and minor cleanups
      fix some more warnings
      fix some more warnings
      make vtkOpenGLTexture use vtkTextureObject
      convert depth peeling to use more texture objects
      a tad more depth peeling cleanup
      add android output window
      better debugging out for shader programs
      clean up some shader code
      new android interactor and cleanup
      some shader cleanup
      some android fixes in progress
      improved release graphics resources
      improved release graphics resources
      minor change to be more compatible with some opengl hardware
      fix android resize and lingering glew issue
      added multitouch framework and support on windows and android
      fix java issue
      in progress
      in progress
      more reasonable first cut at java android
      clean up some shader code and classes
      removed unused includes
      fix some warnings

Kenneth Moreland (2):
      Dax marching cubes now uses input array not active scalars.
      Allow Dax marching cubes and threshold to work with doubles.

Lisandro Dalcin (1):
      import mpi4py 1.3

Marco Cecchetti (5):
      vtkColorString - Helper class for defining a color through a string.
      Merged vtkColorString into vtkNamedColors.
      I added a RGBAToHTMLColor and made some minor changes.
      Tentative fix for Windows build issue.
      Tentative fix for big-endian machine issue.

Marcus D. Hanwell (98):
      Added a test for biquadratic quad interpolation
      Exclude the vtkgl.* files (generated code) from coverage
      Make consistent with vtkBiQuadraticQuad
      Added back the QtSQL test for the database class
      Removed misleading comment - test is built
      Added back various rendering tests
      Added back the named components test in FiltersCore
      Removed a few remaining Cg related files
      Refactored the TIFF reader, add support for floats
      Added progress updates when reading a volume
      Remove redundant checks for old JPEG compression
      Copy simple TIFF images into buffers more directly
      First pass at a new render widget
      Implement a basic VBO based poly data mapper
      Basic support for color from property
      Add the find module for Eigen 3
      Added a hack to override OpenGL overrides with GL2
      Roughly mapping the colors/scalars, updates to shaders
      Normalize the colors, and put the light the other side...
      Added the dragon model (already in external data store)
      Moved the VBO and IBO creation to helper functions
      Use the vtkPolyDataNormals filter to calculate normals
      Added a points/lines test, added point/line rendering
      Added in a program for lines, change
      Moved the replace function into the helper header
      Refactoring a little, movig IBO stuff into structs
      Added a polyline, and basic support for rendering it
      Refactor uniforms a little, enable point rendering again
      Small changes for point size and line width
      Minor clean up for includes in the mappers
      Ensure we set the active shaders
      Removed commented code/classes from the test
      Added in the case for multiple renders/VBO updates
      Refactor the shader API to comply with VTK style
      Refactor API, comply with VTK style
      Refactor the shader program API to comply with VTK style
      Added a Vertex Attribute Object (VAO) class
      Enable textures now that the vtkTexture class doesn't do it
      Set the z-spacing in a TIFF to match x-spacing
      Early attempt at getting the 3D glyph mapper working
      Hackish, map the colors for the glyphs
      Keep the color mapper around, shallow copy for settings
      Fixed the normal matrix, now molecules look much better
      Make it compile on Linux/X again
      Bring over the Cocoa classes for Mac
      Intel GLSL compiler is much fussier about type...
      Removed the vtkFiltersCore dep
      Removed vtkRenderingOpenGL as a dep now too!
      Made vtkRenderingOpenGL2 independent of vtkRenderingOpenGL
      The PainterDeviceAdaptor is abstract, can be NULL
      Rename vtkOpenGL2* -> vtkOpenGL*
      Very judicious use of sed, vtkOpenGL2* -> vtkOpenGL*
      Added a concept of backends, added OpenGL and OpenGL2
      File moves necessary to create a context backend
      Context OpenGL and OpenGL2 backends
      Some minor tweaks to get the tests passing again
      Some modules only in groups if correct backend selected
      Missed these OpenGL2 variants with the mass rename
      Brought more of the OpenGL module logic over
      OpenGL and OpenGL2 are mutually exclusive
      If enabled, always override in OpenGL 2
      Unused include for a file that was deleted
      Disable multitexturing in Geovis class
      Moving rendering tests to more appropriate places
      More test moves into more appropriate locations
      Removed the TDx classes from OpenGL 2
      Only enable backends for interface modules being built
      Disable test for render widget
      Changed the default CDash URL for VTK
      Move several TEST_DEPENDS to switch on backend
      Create object factory CMake file, move vtk_add_override
      Now generate the object factory files in a function
      Revert "updated baseline images"
      Revert "updated baseline image"
      Some dependency updates now vtkRenderingContext2D is abstract
      Don't exclude the module from wrapping - initialization
      Made the label tests pass again!
      Make TCL wrapping happy - no numbers in module names
      Added include for std::string
      Save the rendering backend used to the config file
      Avoid early termination when collecting actors
      vtkOpenGLContextActor should subclass vtkContextActor
      One of the tests needs a context device to render
      Removed unused variable - used in subclasses
      These classes are abstract, fix smoke tests
      Fix for Windows mangling issue
      Must be marked WRAP_EXCLUDE too for Tcl smoke tests
      Reduce the number of renders (avoid time outs)
      Move device adapter initialization to the OpenGL module
      BUG: Make selections more permanent, linked to object
      STYLE: Some basic style fixes
      Removed sorts as the inputs were already sorted
      Added a test to exercise bar graph selection
      Remove the wrap exclusion at the module level
      More exclusions, avoid setting ABSTRACT twice
      TCL doesn't like numbers in module names
      Comment out the animated PDB renders
      CMake's exec_program is deprecated, revert back

MetaIO developers (1):
      MetaIO 2014-07-09 (53aa417f)

Nicole Aucoin (1):
      BUG: fix null pointer crash in view to world with no active camera

Patrick O'Leary (1):
      added paraviewweb widget for catalyst workbench

Paul Edwards (2):
      Fix for polyhedron cells.
      Bug fix for dataset surface filter.

Robert Maynard (15):
      Update Dax Accelerator to use the new tll signature.
      Update the Dax Accelerator to use the new dispatcher classes.
      Correct warnings about negative unsigned constant values.
      Properly implement the factory for the dax filters.
      EnSight Binary uses 64bit longs so explicitly use those instead of long.
      Netcdf now handles different directories for c and cxx bindings.
      Improve the performance of vtkDataArray::ComputeScalarRange.
      Improve the performance of vtkDataArray::ComputeVectorRange.
      Move all free functions in vtkDataArray into an anonymous namespace.
      Update ComputeVectorRange based on gerrit feedback.
      Update DataArray and DataArrayTemplate to use vtkTypeTraits.
      Correct ComputeScalarRange when dealing with multiple components.
      Improve ComputeScalarRange when we have a single component.
      Correct an issue with converting dax data to vtk polydata.
      Refactor GetRange to compute all ranges at the same time.

Sandeep Menon (1):
      vtkOBJReader: accept relative indices in OBJ files

Sankhesh Jhaveri (12):
      BUG: Fix failing EnSightBlow5ASCII tests
      BUG: Turned multisampling OFF for certain tests failing on linux with ATI
      Fixed multisampling issues for some tests on ATI
      ENH: Script to generate API differences between two git revisions
      ENH: Added test for vtkImageCroppingRegionsWidget to improve coverage
      ENH: Enable selection of translucent geometry
      BUG: VTK_JAVA_SOURCE_VERSION to accomodate different java versions
      Re-enabling tests disabled during modularization for Interaction/Widgets
      BUG: Duplicate class definition in TestSeedWidget2
      BUG: Duplicate class definition of vtkSeedCallback2
      Additional baseline for TestAreaSelections
      BUG: Border visibility from underlying vtkScalarBar actor

Scott Wittenburg (9):
      Added code to draw current selection rectangle in viewport.
      Added code to support a cache option for filebrowser widget.
      Added canvas based image zooming and panning capabilities.
      Fixed a null reference by surrounding the call with a check.
      Support faster configuration times by checking dependencies at runtime.
      Changed to make tests run serially, async nature was causing collisions.
      Replace an import which disappeared and broke all dashboard web tests.
      Updating to Autobahn python version 0.8.13 to get http long poll endpoints.
      Added latest Autobahn JS (0.9.4) to support pvweb authentication.

Sean McBride (47):
      bug #14418: Remove addition of "-Wno-deprecated" compiler flag
      Fix clang analyzer warning about passing null to strcmp
      Fixed clang analyzer warning about passing null to memcpy
      Fixed clang analyzer warning about reading uninitialized memory
      Fixed clang analyzer waring about a dead store.
      Fixed clang analyzer warning about dead store
      Fixed clang analyzer warning about dead store.
      Fixed clang analyzer warning about dead store.
      Fixed clang analyzer warning about dead store.
      Fixed clang analyzer warning about dead store.
      Fixed clang analyzer warning about 2 dead stores.
      Fixed clang analyzer warning about dead store.
      Fixed clang analyzer warning about reading past an array.
      Fixed several clang analyzer warnings.
      Fixed clang analyzer warning about reading uninitialized memory.
      Fixed clang analyzer warning about dead store to 'pd'.
      Fixed clang analyzer warning about passing null to memcpy.
      Fixed clang analyzer warning about dead store to 'index'.
      Fixed clang analyzer warning about dead store to 'bestTime'.
      Workaround clang analyzer warning by creating temp variable.
      Fixed clang analyzer warnings about dead stores.
      Misc cleanup of code nearby clang analyzer warnings.
      Fixed clang analyzer warnings about dead stores.
      Fixed clang analyzer warning about dead store at very end of method.
      Fixed clang analyzer warning about dead store to 'itr'.
      Fixed clang analyzer warning about dead store to 'cptr'.
      Fixed null deref found by clang analyzer
      Fixed clang analyzer warnings about dereferences
      Suppress clang analyzer warning
      Fixed clang analyzer warning about null deref
      Fixed clang analyzer warning about reading uninitialized data.
      Fixed infinite recursion in vtkBitArray::RemoveFirstTuple()
      Improved code coverage of vtkScalarsToColors by adding more tests
      Added tests for a few uncovered vtkMatrix3x3 methods
      Fixed error in vtkFiltersCoreCxx-TestClipPolyData test
      Removed -fobjc-gc from VTK_REQUIRED_OBJCXX_FLAGS
      Various Cocoa improvements and fixes
      Fixed a bunch of clang -Wabsolute-value warnings
      Removed all uses of deprecated NSOpenGLPFACompliant
      Assume UTF8 for vtkCarbonRenderWindow::SetWindowName
      Remove unnessary 'if' before 'delete[]'
      Add #error when trying to build as Cocoa ARC
      Fixed confusing indentation, no behaviour change
      Fixed unused variable warning in release
      Rewrote vtkCoreGraphicsGPUInfoList to not use deprecated API
      Removed checks for antique Borland versions
      Changed public API of vtkGPUInfo to return vtkTypeUInt64 for memory sizes.

Sebastien Jourdain (55):
      Add catalyst web widget into VTK
      Add NaN support in web chart rendering
      Add a resampling filter
      Add JSON writer for ImageData
      Extend vtkImageMapToColors to support Mask color and Non Active Scalar input
      Use / for path separator to prevent Windows related issue with escape char
      Improve implementation of Catalyst viewer
      Add image resampler catalyst web widget
      Remove test dependency to data when not needed
      Remove usage of the keyword with to allow old python
      Add new set of catalyst web widgets
      Attempt to handle some system raise condition
      Add catalyst web composite widget
      Better composite catalyst web widget
      better UI for catalyst re-sampler web widget
      Various VTK-web improvement
      Fix vtkweb catalyst css
      Add cost information in workbench analysis
      Improve web compositing for dynamic interaction
      Properly handle background selector visibility
      Fix composite rendering widget for search
      Add sorting capabilities
      Refresh workbench UI and workflow
      Fix Composite Javascript for WebKit
      Improve ParaView cinema UI
      Improve basic search in web-catalyst
      Fix catalyst web - cost time computation
      Improve catalyst web UI
      Catalyst web: Minor Web UI change
      Catalyst-web: Improve composite search experience
      Add image width column
      Add cost estimate for Catalyst Web
      Catalyst-Web estimate UI fix
      Change catalyst-web analysis API to expect full URL
      Fix center of rotation for WebGL renderer
      Fix WebGL background orientation
      Fix basic catalyst viewer with theta
      Add runtime libraries on Windows for Java binary package
      Fix several catalyst web UI issue
      Add configuration pass to Catalyst PVW workflow
      Add support for mobile device interaction
      Catalyst Web - Composite improvement
      Catalyst web
      Add new rendering class API based on vtkPanel class
      Remove @Override annotation to prevent compilation issue on old Java compiler
      Upgrade autobahn version to 0.8.9
      Upgrade Twisted version to 14.0.0
      Upgrade ZopeInterface version to 4.1.1
      Add SixPython module for Autobahn dependency
      Update Autobahn/JS library version
      Update VTK Web Python code to handle WAMP v2
      Update Web applications to support new protocol API
      Fix python for vtkweb
      Allow arbitrary WebSocket endpoint
      Add bottstrap3 + pv lib in loader

Shawn Waldon (2):
      Add a smartpointer for PyObjects
      Format comments according to VTK stlye guide

Shinya Onogi (1):
      fix_GPU_resource_handling

Thomas Vaughan (1):
      Set origin and spacing in vtkSurfaceReconstructionFilter. Ref: Mantis 0002826.

Tristan Coulange (5):
      BUG: fix some xdmf writer crashes
      BUG: Add a missing include for VS 2013
      Add support for original ids for generic dataset
      BUG: fix xdmf test failure
      BUG: Fix the quads evaluate location

Utkarsh Ayachit (31):
      Adding a new test for TestSocketCommunicator.
      Added test to test vtkSynchronizedRenderers.
      Deprecate vtkOpenGLPolyDataMapper.
      Fix segfault with TestSetGet.
      Fix build issues with deprecated vtkOpenGLPolyDataMapper.
      Add a delay between process launches.
      Fixed mismatches cell arrays in vtkPStreamTracer.
      Added ability to probe filter to allow disabling of passing field data.
      Add support for empty strinngs in SetInputArrayToProcess.
      Make it possible to override ClampPos.
      Remove OpenGL error checks that were causing errors.
      BUG #14244: Fix stereo image captures.
      Add helper method to convert from SelectionField to AttributeType.
      Fix appending of scalar arrays.
      Fix DataSet reference in when input array is passed to output.
      Avoid exceptions on StringArrays.
      Fixed exceptions with older numpy version.
      Cleanup MPI controller properly.
      vtkExtractSelectedRows only works with IdTypeArray.
      BUG #14828: Keep surface color from interacting with scalar color.
      Handle append scalar in CompositeDataSetAttributes.
      BUG: Fixed opacity mapping when scalar array is vtkUnsignedChar.
      BUG #14813: Fix range reported for mode shapes.
      BUG #14599: Handle double values properly.
      Fix issue with empty arrays with numpy 1.2.1.
      Don't glyph masked points in vtkUniformGrid.
      BUG: Fix invalid return value check in vtkClientSocket.
      vtkScalarBarRepresentation doesn't call Superclass.
      Fixed logic to work when an empty vtkSelection is passed.
      Fix handling of empty selection on ParallelCoordinates.
      Fixed issue with selection frame line style.

Will Schroeder (7):
      Disabling translation and scaling now works.
      Added the ability to specify a clip tolerance.
      Fixed bug causing plane to disappear on boundary.
      InsertNextCell and related method now return the proper vtkIdType.
      Create vtkPolyData instead of vtkUnstructuredGrid when passing points.
      Extended filter to support culling unused points.
      Added ability to control alpha shape output

XDMF Developers (3):
      export xdmf for import into vtk
      export xdmf for import into vtk
      export xdmf for import into vtk

Xabi Riobe (1):
      BUG: The method vtkClipPlanesPainter::UpdateBounds must not be implemented.

Zack Galbreath (25):
      fix lingering off-by-one error
      new writer: vtkPhyloXMLTreeWriter
      attempt to silence "possible loss of data" warning
      improve the thoroughness of TestPhyloXMLTreeWriter
      add baseline directory
      get the baseline file's path from the command line
      add option to write XML to string instead of file
      fix failing tests revealed by gerrit
      fix the format of PhyloXML references
      fix blank newline in XML output
      vtkXMLReader can now read from an input string
      new class: vtkPhyloXMLTreeReader
      consolidate tests for PhyloXML
      silence unused parameter warning
      change signatures for wrapping
      copy row names from R to vtkTable
      do not assume 1st column holds row names
      fix failing SetGet test forvtkHeatmapItem
      preserve R data.frame row names
      break vtkRCalculatorFilter's input/output symmetry
      style cleanup
      add SSL support to VTKWeb server
      fix potential segmentation fault
      change the way we shut down the R interface
      fix failing R tests reported by CDash

xabi riobe (4):
      Fix memory leak in vtkPNGWriter when OutOfDiskSpaceError
      Initialize row_pointers
      Fix numerical precision problem in vtkCellLocator::IntersectWithLine
      Add default value for argument

Revision 23528 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 1 02:12:59 2014 UTC (3 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45453 byte(s)
Diff to previous 23522
COMP: Revert back to VTK 6.1. See #3741

It turns out that updating the version of XCode  used on the factory
(running Snow Leopard) from 3.2.6 to 4.2 avoids to get the rather
obnoxious errors of the form:

// ---------------------
[ 53%] Built target vtkSlicerAtlasCreatorModuleLogic
Linking CXX shared library ../../../../lib/Slicer-4.3/qt-loadable-modules/libvtkSlicerAtlasCreatorModuleLogicPythonD.dylib
ld: warning: duplicate dylib /Users/kitware/Dashboards/Experimental/Slicer4-SB/python-install/lib/libpython2.7.dylib
ld: two level namespace mach-o files can link with at most 253 dylibs, this link would use 257 dylibs
collect2: ld returned 1 exit status
// ---------------------

This has been confirmed doing

(1) a clean build of Slicer r23525 using:
 Slicer/VTK@169b37b
 CMake 2.8.12

(2) a clean build of CarreraSlice against the Slicer build tree
obtain in (1) also using CMake 2.8.12

More particularly, this commit reverts r23512, r23513, r23514 and r23515
The code checking for the version of CMake and enabling the option
VTK_ENABLE_KITS only available with kitware/VTK@a609ca has been removed.

XCode before:

 * Xcode: 3.2.6 - uildVersion: 10M2518
 * gcc-4.0: i686-apple-darwin10-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5494)
 * gcc-4.2: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
 * llvm-gcc: i686-apple-darwin10-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.6)
 * clang: Apple clang version 1.7 (tags/Apple/clang-77) (based on LLVM 2.9svn

XCode after:

 * Xcode: 4.2 - Build version 4C199
 * gcc-4.0: i686-apple-darwin10-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5494)
 * gcc-4.2: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
 * llvm-gcc: i686-apple-darwin10-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.1.00)
 * clang: Apple clang version 3.0 (tags/Apple/clang-211.10.1) (based on LLVM 3.0svn)

The XCode configuration details has been obtained using the following
one-liner adapted from the one available on XcodeVersionInfo macports
page [1]:

// --------------------
echo -en " * Xcode: $(/usr/bin/xcodebuild -version |head -n1) - $(/usr/bin/xcodebuild -version |tail -1)\n\
$(test -x /usr/bin/gcc-3.3\
&& echo " * gcc-3.3: $(/usr/bin/gcc-3.3 --version 2>/dev/null |head -1)\n")\
$(test -x /usr/bin/gcc-4.0\
&& echo " * gcc-4.0: $(/usr/bin/gcc-4.0 --version 2>/dev/null |head -1)\n")\
$(test -x /usr/bin/gcc-4.2\
&& echo " * gcc-4.2: $(/usr/bin/gcc-4.2 --version 2>/dev/null |head -1)\n")\
$((test -x /usr/bin/llvm-gcc-4.2 || test -x /Developer/usr/bin/llvm-gcc-4.2)\
&& echo " * llvm-gcc: $((/usr/bin/llvm-gcc --version 2>/dev/null || /Developer/usr/bin/llvm-gcc --version 2>/dev/null) |head -1)\n")\
$((test -x /usr/bin/clang || test -x /Developer/usr/bin/clang)\
&& echo " * clang: $((test -x /usr/bin/clang\
&& /usr/bin/clang --version 2>&1 || /Developer/usr/bin/clang --version 2>&1) |head -1)\n")"
// --------------------

Note also that running this on-liner using the freshly installed version
of XCode return the following message:

** INTERNAL ERROR: Uncaught exception **
Exception: *** -[NSConcreteFileHandle writeData:]: Broken pipe


Finally, for future reference, the package allowing to install xcode is
named "xcode_4.2_for_snow_leopard.dmg" and the associated
MD5 is "428b006e1c12eaa644a442a598c6f13f". It has been installed using
the default option in the "/Developer" folder.

[1] https://trac.macports.org/wiki/XcodeVersionInfo

Revision 23522 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 30 21:25:05 2014 UTC (3 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45995 byte(s)
Diff to previous 23514
COMP: SimpleITK is now enabled by default.

SimpleITK is a first class citizen in Slicer and is now enabled by default.

Revision 23514 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 30 10:38:40 2014 UTC (3 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45996 byte(s)
Diff to previous 23513
COMP: Update minimum required VTK version

This commit will fix the following warning:

CMake Error at CMakeLists.txt:701 (find_package):
  Could not find a configuration file for package "VTK" that is compatible
  with requested version "6.1".

  The following configuration files were considered but not accepted:

    /path/to/Slicer-SuperBuild/VTKv6-build/VTKConfig.cmake, version: 6.2.0

Revision 23513 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 30 10:09:44 2014 UTC (3 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45997 byte(s)
Diff to previous 23509
COMP: Fix logic setting VTK_ENABLE_KITS. See #3741

This commit ensures that the variable will be set for MacOSX < 10.8

Revision 23509 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 30 03:00:19 2014 UTC (3 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46104 byte(s)
Diff to previous 23413
COMP: Fix VTK6 link error on MacOSX 10.6. Fixes #3741

To reduce the number of libraries passed to the linker, this commit build
VTK6 with the VTK_ENABLE_KITS option enabled.

If building on MacOSX 10.6 without CMake 3.0, it also updated the build
system to output a fatal error message explaining that a more recent
version of CMake is required.

Revision 23413 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 4 01:34:23 2014 UTC (3 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45634 byte(s)
Diff to previous 23396
COMP: Move most of find_package calls into each Slicer sub-project.

To help address issue #3741 [1], call to find_package associated to CTK,
DCMTK, ITK and SlicerExecutionModel have been moved in every Slicer
sub project, library or module expecting it.

This allows to reduce both the number of include directories and
the number of libraries passed to the compiler.

Moving forward, every Slicer sub project, library or module will be
responsible to call find_package (optionally specifying a list of
components) and (if it applies) include the associated "use file".

Note that call to find_package(VTK) is still done at the top-level, before
moving the call to the expected sub-directories, the CTKConfig.cmake
will have to be updated to call find_package(VTK) specifying the required
components where it is needed.

[1] http://na-mic.org/Mantis/view.php?id=3741

Revision 23396 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 30 13:18:21 2014 UTC (3 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47605 byte(s)
Diff to previous 23373
COMP: Remove unused CLIs MIDASApplications and BatchMakeApplications

See #3401

Revision 23373 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 26 06:24:25 2014 UTC (3 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47850 byte(s)
Diff to previous 23361
ENH: Update (1) ITKv4 from v4.5.2 to v4.6rc01 and (2) update BRAINSTools

// ------------------------
BRAINSTools

 * Compliant with ITKv4 registration framework. This changes
the fundamental methods for registration to use the ITKv4 framework,
while maintaining both the API and the same results for all regression tests.

 * DWIConvert tool also add features for reading additional scanner types.
// ------------------------


// ------------------------
ITKv4 - New Features

* CMake improvements
 - Improved Remote Module support
 - Add ITK_FORBID_DOWNLOADS for package maintainers
 - ITK_USE_SYSTEM_EXPAT available

* Filtering Improvements
 - Moved TransformToDisplacementField out of Review
 - An entire noise image generation module
   - http://hdl.handle.net/10380/3158
 - Better pipeline support for ResampleImageFilter
 - Move MagnitudeAndPhaseToComplexImageFilter out of Review
 - Setters for LabelMap overlay filters
 - More consistent filter progress reporting

* ImageO improvements
 - Register the GE image formats by default
 - More IO modules are built as shared libraries
 - OpenFileForReading/Writing methods in ImageIO
 - Support for system tiff 4.0.0-4.0.2 (e.g. some Ubuntu versions)
 - Mangling to internal OpenJPEG
 - SCIFIO improvements

* Infrastructure improvements
 - MetaDataObject print specialization for common types
 - Improvements to ResourceProbe and RealTimeClock
 - More Solve methods for VNLSparseLUSolverTraits
 - Output stream operator for LightObject exposed
 - FFTW bump to 3.3.3

* New Remote Modules
 - Skull stripper
   - http://hdl.handle.net/10380/3353
 - Wiki examples
 - Sphinx examples
 - Variational registration
   - http://hdl.handle.net/10380/3460
 - AnalyzeObjectMapIO
   - http://hdl.handle.net/1926/593
 - FDFImageIO
 - SplitComponents
   - http://hdl.handle.net/10380/320

* Registrationv4 improvements
 - v4 regular step gradient descent optimizer
 - v4 amoeba optimizer
 - v4 exhaustive optimizer
 - v4 Powell optimizer
 - v4 one-plus-one-evolutionary optimizer
 - v4 LBFGS optimizer improvements
 - Use registration method classes as pipeline filters

* Performance improvements
 - Registrationv4
 - Histogram computation
 - Improved SmartPointer copy
 - CompositeTransform
 - Registration Jacobian re-use

* Wrapping improvements
 - pygccxml 1.0.0
 - .pth symlink usable in a virtualenv
 - Cleaner CMake configuration
 - SWIG and PCRE updated to 3.0.2, 8.34
 - Latest GCCXML, which works with GCC 4.9
 - Sweeping wrapping generation cleanup


* Many style improvements -- ITK gets more stylish with every release!

* Improved code coverage -- some measures put us over 85%!
// ------------------------

Co-authored-by: Hans Johnson <hans-johnson@uiowa.edu>

Revision 23361 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 22 21:23:37 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47759 byte(s)
Diff to previous 23360
BUG: Consider inner build dir when checking for max root directory length.

This commit introduces the convenience CMake module "PreventDirWithTooManyChars"
and update code to account for length of the inner build subdirectory.

It means if the maximum length of the top-level build directory is 40,
assuming the inner build directory is "Slicer-build", the check in
the inner build will expect a path of length 53.

Revision 23360 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 22 21:23:35 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48362 byte(s)
Diff to previous 23356
COMP: Ensure PreventDirWithSpaces CMake variables is passed to inner project.

This commit ensures that spaces can be used in either source or build
directory when configuring Slicer inner project. This is done by passing
down the variable ${PROJECT_NAME}_SKIP_DIR_WITH_SPACES_CHECK

This commit also documents and simplifies usage of
"PreventDirWithSpaces" CMake module.

Revision 23356 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 21 16:20:05 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48452 byte(s)
Diff to previous 23355
COMP: Find qRestAPI package only where required.

This commits moved the discovery of the qRestAPI module in both QTCore
library and DataStore remote module.

Revision 23355 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 21 16:20:03 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48738 byte(s)
Diff to previous 23353
COMP: Find LibArchive/CURL/OpenIGTLink/ZLIB package where required.

This commit complements commit r23350 and will help reducing the number
of parameters passed to the compiler/linker. See #3741

Revision 23353 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 21 02:17:55 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 49716 byte(s)
Diff to previous 23352
COMP: On MacOSX, waiting issue #3741 is *really* solved uses VTK 5.10

It turns out that the test build I initiated managed to go way beyond
the original stopping point [See r23344]. That said, there are still
the same issue when building SubjectHierarchy, Annotations module ...

This commits reverts back to VTK 5.10 for MacOSX.

The solution gonna be to continue the work initiated in [1] and
remove the top level call to "find_package()" and instead have
every Slicer libraries/modules including his set of direct dependencies.

[1] http://massmail.spl.harvard.edu/public-archives/slicer-devel/2014/015671.html

Revision 23352 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 21 02:07:09 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 49476 byte(s)
Diff to previous 23350
COMP: Re-enable VTKv6 on MacOSX.

Since following commit r23350, issue #3741 is resolved, this commit
re-enables VTKv6 on MacOSX.

Revision 23350 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 21 01:47:38 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 49716 byte(s)
Diff to previous 23344
COMP: Specify minimum set of VTKv6 libraries. Fixes #3741

The VTK utility: Utilities/Maintenance/WhatModulesVTK.py discovers
which modules are used in a project. This patch modifies the Slicer
CMakeLists.txt file to only load the vtk modules used by Slicer. This
should reduce the number of libraries being linked.

This commit also updates CTK project including a patch reducing
the number of library associated with CTKImageProcessingITKCore library.

// ----------------
$ git shortlog 48ef9aeb8..282abc7 --no-merges
Jean-Christophe Fillion-Robin (1):
      CTKImageProcessingITKCore - With ITKv4, link only to the required libraries
// ----------------

Co-authored-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

From: Bill Lorensen <bill.lorensen@gmail.com>

Revision 23344 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 18 23:03:39 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48822 byte(s)
Diff to previous 23336
COMP: On MacOSX, waiting issue #3741 is solved uses VTK 5.10

As illustrated in the bug report [1], the maximum number of linked libraries
is reached  on MacOSX 10.6 (see below for an example of message) but there
are no problem on MacOSX 10.8 (at least when targeting 10.9).

// ---------
ld: warning: duplicate dylib /path/to ...
[...]
ld: warning: duplicate dylib /path/to ...
two level namespace mach-o files can link with at most 253 dylibs, this link would use 287 dylibs
// ---------

Waiting we come up with a solution or understand better the scope of the
problem, this commit force the VTK version to 5.10.

[1] http://na-mic.org/Mantis/view.php?id=3741

Revision 23336 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 18 04:18:39 2014 UTC (3 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48582 byte(s)
Diff to previous 23294
COMP: Change default version of VTK to 6

As discussed during June 17 developer hangout and also highlighted on the
Slicer developer list [1], consider that a lot of developer have been
reporting issue and we now have the Slicer application able to build and
run when build against VTK6. This commit changes the default version of VTK.

It is anticipated that some extension will fail to build, error will be
addressed as they come. Additional help will also be provided for
extension developers during the coming project week. See [2]

[1] http://slicer-devel.65872.n3.nabble.com/VTK-6-enabled-by-default-tt4031841.htm

[2] http://www.na-mic.org/Wiki/index.php/2014_Summer_Project_Week

Revision 23294 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 30 22:44:46 2014 UTC (3 years, 4 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48582 byte(s)
Diff to previous 23290
ENH: Create CLI Extension Wizard 'launcher'

Create a wrapper script to set up the environment (using the Slicer
launcher's --launcher-show-set-environment-commands) and execute the CLI
Extension Wizard via the appropriate Python interpreter. (Also, install
the Python application launcher wrapper for the same.)

This should provide a single, consistent mechanism for running the CLI
Extension Wizard (from a bash shell) from both build and install trees,
and regardless of whether system or Slicer-built Python is used. (On
Windows, git-bash must be used.)

Revision 23290 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 30 22:43:25 2014 UTC (3 years, 4 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48379 byte(s)
Diff to previous 23227
ENH: Add support for real Qt resources in Python

Add methods to qSlicerCoreApplication to allow Python code to invoke the
raw data overloads of QResource::[un]registerResource (which otherwise
cannot be invoked, as the requisite uchar* overloads are hidden by the
QString overloads). Create a Python script to generate a Python compiled
resource script (similar to pyrcc4 or pyside-rcc, except leveraging Qt's
native rcc rather than reimplementing it). Create CMake functions to
invoke this in an appropriate manner, and to create necessary target
dependencies so that the resulting Python files are created before the
ctkFunctionAddCompilePythonScriptTargets targets try to copy them to
their final build locations.

This system will allow Python loadable modules to use Qt resources by
creating a .qrc file and loading the resources using ':/path' notation,
in the same manner as C++ code (rather than individually copying every
resource file and loading them relative to the module's directory).

Revision 23227 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 22 18:52:03 2014 UTC (3 years, 5 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48225 byte(s)
Diff to previous 23210
ENH: Install Extension Wizard templates

Add rules to install the module/extension templates used by the
Extension Wizard. This makes them available to users that do not have a
source checkout.

Revision 23210 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 19 21:31:59 2014 UTC (3 years, 5 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48187 byte(s)
Diff to previous 23122
ENH: Refactor documentation targets

Replace generate_userdoc.cmake script with direct build commands,
separating creation of the doc and creation of the tarball thereof into
separate targets, for consistency with how the SlicerWizard doc build
rules are set up. Also modify the latter to explicitly remove the old
tarball first for consistency with (the historic and retained behavior
of) the former.

The old rules depended on the output index.html, which would cause them
to do nothing once the doc had been created (ever). The new rules, like
the rules for the SlicerWizard doc, have no dependencies and so the doc
is always regenerated when the target is traversed. As doxygen
unfortunately does not implement its own dependency tracking (sphinx
does), this is very inefficient, but more correct, which is more
important for this case.

Revision 23122 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 2 21:55:04 2014 UTC (3 years, 5 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 48144 byte(s)
Diff to previous 23121
ENH: Add VTK 6 support 2/2

Issue #3514

Revision 23121 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 2 21:49:48 2014 UTC (3 years, 5 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 48144 byte(s)
Diff to previous 23099
ENH: Add VTK 6 support 1/2

1) Support vtk6 to build system.
http://www.vtk.org/Wiki/VTK/Build_System_Migration
Give users a build option between vtk5 and vtk6.
Solve vtk library python wrapping for VTK 6
Use system zlib (this is a hack)
Use system png (this is a hack)

2) Update dependency projects in superbuild including VTK, CTK, OpenIGTLinkIF, MultiVolumeExplorer.

3) Remove deprecated Macro.
The following two macros were deprecated in VTK 5.0 that were still supported, but have now been eliminated:
vtkTypeRevisionMacro has been replaced with vtkTypeMacro; vtkCxxRevisionMacro has been removed.
http://www.visitusers.org/index.php?title=VTK_6.0_Upgrade

The following two macros were deprecated in VTK 6.0 if VTK_LEGACY_REMOVE is on:
VTK_LARGE_INTEGER and VTK_LARGE_FLOAT
https://github.com/Kitware/VTK/blob/9a0fbb8da1a1701dc1b44c71467b969b3302efad/Common/Core/vtkType.h#L158-159

vtkFloatingPointType is replaced with double.
http://review.source.kitware.com/#/t/1667/

vtkType deprecations
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/vtkType_deprecations

4) Replace SetInput() with SetInputData() and SetInputConnection(), the same kind of functions include SetInput1(), SetInput2(), AddInput() and SetSource().
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Replacement_of_SetInput

5) Remove GetProducerPort() from vtkDataObject.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_GetProducerPort

6) Remove Execute
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_Execute

7) Remove SetWholeExtent() from vtkDataObject
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_SetWholeExtent

8) Remove Methods for Manipulating Update Extent
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_Methods_for_Manipulating_Update_Extent

9) Change AllocateOutputData() in vtkImageAlgorithm.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Change_to_AllocateOutputData

10) Remove CopyInformation and CopyTypeSpecificInformation from vtkDataObject and vtkImageData.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_CopyInformation

11) Remove GetPipelineInformation and GetExecutive from vtkDataObject.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_GetPipelineInformation

12) VTK6 requires #include <vtkVersion.h> to use the VTK_xxx_VERSION preprocessor directives.
http://vtk.org/Wiki/VTK/VTK6/Migration/WikiExamples#Improve

13) Remove Methods for Manipulating Update Extent.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_Methods_for_Manipulating_Update_Extent.
http://vtk.org/Wiki/VTK/VTK6/Migration/WikiExamples#Improve.

14) Change scalars manipulation functions
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Changes_to_Scalars_Manipulation_Functions.
http://vtk.org/Wiki/VTK/VTK6/Migration/WikiExamples#Improve.

15) Remove Pipeline Update Methods from vtkDataObject.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_Update

16) Remove Pipeline Update Methods from vtkDataObject.
http://www.vtk.org/Wiki/VTK/VTK_6_Migration/Removal_of_Update.

17) Refactor functions in vtkMRMLModelNode and sublcasses.

18) Refactor functions in vtkMRMLVolumeNode and its subclasses.
Use ImageDataPort instead of ImageData

Issue #3514

From Yuzheng Zhou <yuzheng.zhou@kitware.com>

Revision 23099 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 16 07:58:11 2014 UTC (3 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46965 byte(s)
Diff to previous 23077
BUG: Fix CMake 3.x configuration warnings

Test done using CMake 3.0.20140413 (g94d5a)

Since project version is explicitly set, avoid warning by setting
policy CMP0048

Since ITKConfig.cmake append value to "ITK_LIBRARIES" and "ITK_INCLUDE_DIRS"
variables, let's make sure that "ITKFactoryRegistration" is not in the list
when configuring "ITKFactoryRegistration". This fixes the following
warnings:

//--------------
CMake Warning (dev) at Libs/ITKFactoryRegistration/CMakeLists.txt:55 (add_library):
  Policy CMP0038 is not set: Targets may not link directly to themselves.
  Run "cmake --help-policy CMP0038" for policy details.  Use the cmake_policy
  command to set the policy and suppress this warning.

  Target "ITKFactoryRegistration" links to itself.
This warning is for project developers.  Use -Wno-dev to suppress it.
//--------------

Revision 23077 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 11 04:10:41 2014 UTC (3 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47148 byte(s)
Diff to previous 23004
ENH: Remove ITKv3 support

As discussed on the mailing list [1] and reported on the Roadmap [2],
this commit removes all conditional code that was allowing Slicer4 to be
compiled against ITKv3.

Code that was building only against ITKv3 has also been removed. This
includes DicomToNrrdConverter CLI module
and SlicerITKv3N4MRIBiasFieldCorrectionImageFilter class.

[1] http://slicer-devel.65872.n3.nabble.com/Removal-of-ITKv3-support-tt4031364.html

[2] http://wiki.slicer.org/slicerWiki/index.php/Roadmap#Deprecation_.2F_API_Changes

Revision 23004 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 14 19:47:43 2014 UTC (3 years, 7 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48949 byte(s)
Diff to previous 23000
BUG: Fix documentation targets

Move 'doc' target to be created, initially with no dependencies, to the
root CMakeLists.txt, so that it is always available for non-Doxygen doc
targets (e.g. SlicerWizard-doc). Change doxygen doc target to be a
separate target that is then added as a dependency of 'doc' in the same
manner as SlicerWizard-doc. Remove logic to control when targets are
part of the default target except from the root 'doc' target (since
duplicating it is superfluous).

Revision 23000 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 12 18:51:18 2014 UTC (3 years, 7 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48787 byte(s)
Diff to previous 22987
ENH: Add version information to SlicerWizard

Add package version information to SlicerWizard, and add display of the
same via the usual '--version' argument to the Extension Wizard. Note
that this is done via a committed file containing the version
information which is duplicated from the top-level CMakeLists.txt. There
is also a CMakeLists.txt now in Utilities/Scripts/SlicerWizard to update
this file, which should keep the contents in sync. Updating the version
should ideally be done by making the changes in the top-level
CMakeLists.txt, configuring, and *then* committing the changes (which
will include as a result the SlicerWizard __version__.py).

Revision 22987 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 12 18:51:04 2014 UTC (3 years, 7 months ago) by mwoehlke
Original Path: trunk/CMakeLists.txt
File length: 48738 byte(s)
Diff to previous 22797
ENH: Add documentation generation for SlicerWizard

Add CMake machinery to generate (using sphinx) HTML documentation from
the Python docstrings of SlicerWizard. I've been using this internally
(calling sphinx-build by hand) for a while now, but am committing it now
that it has been tied into CMake. Parts of this are generated from
sphinx-apidoc, but there are also already some enhancements added, e.g.
intersphinx setup, and the overriding of autodoc.ClassDocumenter to
remove the redundant module name from class module classes.

Revision 22797 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 6 14:54:35 2014 UTC (3 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48685 byte(s)
Diff to previous 22776
COMP: Pass CMAKE_BUILD_TYPE to external project for all configurations

Thanks to Hans Johnson <hans-johnson@uiowa.edu> for reporting the problem.

Before this commit, CMAKE_BUILD_TYPE was passed to external project only
the first configuration if it wasn't already defined (by passing -D option).

Co-authored-by: Hans Johnson <hans-johnson@uiowa.edu>

Revision 22776 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 17 06:07:46 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48643 byte(s)
Diff to previous 22773
COMP: Easier maintenance simplifying process to add remote module source

Following this commit, adding a remote module source to Slicer can
simply be done calling:

 Slicer_Remote_Add(Foo
   GIT_REPOSITORY git://github.com/john/foo
   GIT_TAG abcdef
   OPTION_NAME Slicer_BUILD_Foo
   LABELS REMOTE_MODULE
   )

As a side effect, (1) the option "Slicer_BUILD_Foo" will automatically be
added as an advanced option and (2) the CMake variables "Slicer_BUILD_Foo"
and "Foo_SOURCE_DIR" will be passed to Slicer inner build.

Additionally, by associating the "REMOTE_MODULE" label, the corresponding
source directory will be added automatically using a call 'add_directory'
similar to this one:

 add_directory(
   /path/to/Slicer-build/Foo
   /path/to/Slicer-build/Slicer-build/Module/Remote/Foo)

This happen in the Slicer/Modules/Remote/CMakeLists.txt file.

Finally, note that a new module named "ExternalProjectAddSource" has been
added, it is still experimental and should be considered as
internal to Slicer without any promise to keep backward compatibility.

Revision 22773 - (view) (download) (annotate) - [select for diffs]
Modified Sun Dec 15 08:02:44 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 50523 byte(s)
Diff to previous 22758
COMP: Simplify external project includes & passing of CMake vars to project

A new module named "ExternalProjectDependency" has been introduced, it is
equivalent to the Artichoke module at revision commontk/Artichoke@70ed903.

This new module is now used within Slicer to support its build system. To
maintain backward compatibility with existing extensions, the modules
"SlicerMacroEmptyExternalProject" and "SlicerMacroCheckExternalProjectDependency"
are kept around.

Revision 22758 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 3 22:50:27 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48258 byte(s)
Diff to previous 22757
COMP: Remove CMake code that was updating now unused QTLIBLIST variable

Following commit r22756, the use of QTLIBLIST has been superseded by
the Slicer_REQUIRED_QT_MODULES variable.

Revision 22757 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 3 22:50:25 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48316 byte(s)
Diff to previous 22756
COMP: Fix configuration by expecting phonon Qt component only on windows

This commit fix configuration issue introduced by r22756

Revision 22756 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 3 22:09:36 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48256 byte(s)
Diff to previous 22739
COMP: Add Slicer_ADDITIONAL_REQUIRED_QT_MODULES to add QT modules

 * Manually prefix the modules because some modules (e.g. PHONON) may not
have the "QT" prefix.
 * Synchronize the required modules with the packaged modules

From: Julien Finet <julien.finet@kitware.com>

Revision 22739 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 26 01:05:59 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47959 byte(s)
Diff to previous 22730
COMP: External_curl: Fix build issue + Build against patched 7.34.0 release

This commit install the project so that all needed headers are all
in the same folder.

It also change the version of curl to 7.34.0 with an additional patch
adding CURL_STATICLIB to curlbuild.h to fix build issue on windows
and unix system.

Finally, it reverts r22728 which was incorrectly addressing the build
error described in the corresponding commit message.

Revision 22730 - (view) (download) (annotate) - [select for diffs]
Modified Mon Nov 25 18:44:40 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47917 byte(s)
Diff to previous 22726
COMP: Fix usage of CURL_INCLUDE_DIRS CMake variable

Following commit r22724, cmcurl project has been removed
in favor of the official curl project. When doing this transition, the call
to "include(${SLICERLIBCURL_USE_FILE})" has been improperly change
info "include(${CURL_INCLUDE_DIRS})".

Since the CURL include directories are already included in [1] and [2],
this commit remove the incorrect call to "include(${CURL_INCLUDE_DIRS})".

[1] Libs/RemoteIO/CMakeLists.txt
[2] Modules/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt

Revision 22726 - (view) (download) (annotate) - [select for diffs]
Modified Sun Nov 24 20:40:51 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47947 byte(s)
Diff to previous 22724
COMP: Consistently pass LibArchive parameters when configuring Slicer

This will ensure LibArchive is properly found.

See #1739

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

Revision 22724 - (view) (download) (annotate) - [select for diffs]
Modified Sun Nov 24 08:09:34 2013 UTC (3 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48050 byte(s)
Diff to previous 22703
COMP: Support Slicer_USE_SYSTEM_* option. Fixes #1739

This commit implements four main changes:

  (1) it updates Slicer build system to support configuring Slicer passing
      Slicer_USE_SYSTEM_* CMake variables

  (2) it updates to a newer version of CTK able to understand CTK_USE_SYSTEM_*
      options. List of CTK contribution associated with this update are
      reported below.

  (3) it changes curl library from "slicerlibcurl/cmcurl/curl" v7.12.1
      to the more recent official CMake'ified curl v7.33.0. This has the
      benefit of making it easier to build against the corresponding
      system library.

  (4) It implements workaround allowing some CLIs to built on Debian-like
      distribution that is providing DCMTK 3.6.0.
      See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637687
      EMSegment project has also been updated to implement a similar
      workaround.

The macro "SlicerMacroCheckExternalProjectDependency" allowing to
recursively traverse the external project dependency tree has been
updated.

The traversal is now done in two passes. The first pass traverses the
complete tree to set the value of Slicer_USE_SYSTEM_*.

The second pass invokes the "ExternalProject_Add" function and displays
informative messages. In addition to the usual "[OK]" and "[INCLUDED]"
suffixes, an additional text "(SYSTEM)" is displayed. It means the
corresponding libraries (and headers) installed on the system will be
used.

On Ubuntu 13.10, support for the following options have been
tested simultaneously:
  -DSlicer_USE_PYTHONQT_WITH_OPENSSL:BOOL=ON
  -DSlicer_USE_SYSTEM_python:BOOL=ON
  -DSlicer_USE_SYSTEM_DCMTK:BOOL=ON
  -DSlicer_USE_SYSTEM_LibArchive:BOOL=ON
  -DSlicer_USE_SYSTEM_curl:BOOL=ON
  -DSlicer_USE_SYSTEM_teem:BOOL=ON
  -DSlicer_USE_SYSTEM_OpenIGTLink:BOOL=ON
  -DSlicer_USE_SYSTEM_OpenSSL:BOOL=ON # Implicitly set because python depends
                                      # on OpenSSL.
  -DSlicer_BUILD_OpenIGTLinkIF:BOOL=OFF # Only openigtlink version1 are available
                                        # and code does NOT supports only v2.

To successfully build Slicer against system libraries, the corresponding
packages have been installed:
  sudo apt-get install libssl-dev \
    libdcmtk-dev \
    libarchive-dev \
    libpython2.7-dev \
    python-numpy \
    libcurl4-openssl-dev \
    libteem-dev \
    tk-dev \
    tcl-dev \
    itcl3-dev \
    libopenigtlink1-dev

While not tested, support for the following option has also been
implemented:
  -DSlicer_USE_SYSTEM_ITKv4:BOOL=ON
  -DSlicer_USE_SYSTEM_VTK:BOOL=ON

CTK updates:

$ git shortlog  91cdf9e0f...02ecc27d0

Jean-Christophe Fillion-Robin (39):
      Ensure CTK_INSTALL_QTPLUGIN_DIR is properly set
      Ensure "CMAKE_INSTALL_PREFIX" is properly passed to inner project.
      By default, do not install application headers
      Install CTK's *.cmake files
      Merge branch '65-packaging-support' into 403-relocatable-ctkconfig-usectk
      Set plugin install rules for target and include files
      Remove commented code and unused vars from CTKConfig / CTKGenerateCTKConfig
      Explicitly set default value for CTK_INSTALL_QTPLUGIN_DIR
      Remove explicit setting of CMake policies.
      Improve FindDCMTK.cmake documentation
      Add DCMTK 3.6.0 support to ctkDICOMUtil.cpp
      Ensure DCMTK libraries can be found on system without setting DCMTK_DIR
      FindDCMTK - Workaround bug in packaging of DCMTK 3.6.0 on Debian.
      Add support for install-able and relocatable package.
      Merge branch '382-fix-find-dcmtk-issue'
      Merge branch '403-relocatable-ctkconfig-usectk'
      Merge branch '405-support-dcmtk-360'
      Fix -Wunused-but-set-variable in transfer function tests
      Merge branch '209-fix-vtk-transfer-function-test-warnings'
      Fix linking of VTKCoreCppTest by adding a check for linker capabilities
      Merge branch 'fix-vtk-core-test-link-error'
      COMP: FindDCMTK - Exclude -D from DCMTK_DEFINITIONS for easier re-use
      Merge branch '382-fix-find-dcmtk-issue'
      Associate DCMTK_DEFINITIONS to CTKDICOMCore
      Merge branch '413-associated-dcmtk-definitions-to-ctkdicomcore'
      Merge pull request #410 from NifTK/409-widgets-on-ctkPopupWidget-do-not-get-keyboard-focus
      Add DCMTK 3.6.0 support to CTK application.
      Merge branch '405-support-dcmtk-360'
      Fix configuration of CTKConfig based on DCMTK_HAVE_CONFIG_H_OPTIONAL value
      Merge branch '413-associated-dcmtk-definitions-to-ctkdicomcore'
      Add convenience function "ctk_list_to_string"
      Automatically reformat list passed to "CTK" inner build.
      COMP: Add support for CTK_USE_SYSTEM_* options
      Merge branch '418-support-use-system-option'
      FindDCMTK - Do not explicitly set DCMTK_DEFINITIONS
      FindDCMTK - Clean white spaces
      Merge branch '382-fix-find-dcmtk-issue' into 413-associated-dcmtk-definitions-to-ctkdicomcore
      Associate CTKDICOMCore with DCMTK_DEFINITIONS in build and install tree
      Merge branch '413-associated-dcmtk-definitions-to-ctkdicomcore'

Miklos Espak (1):
      Active window flag transferred on RequestSoftwareInputPanel event

Steve Pieper (2):
      Put all tags for a given instance into a list for a single batch insert
      Merge pull request #415 from pieper/414-batch-insert-tags

See #1739

Revision 22703 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 14 19:12:40 2013 UTC (3 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48013 byte(s)
Diff to previous 22702
COMP: Revert  tweak release 4.3.1-1 commit done on trunk

This commit revert the previous commit r22702. This commit should be
done on the Slicer-4-3-1-1 branch instead of the trunk.

Revision 22702 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 14 18:26:46 2013 UTC (3 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48012 byte(s)
Diff to previous 22600
ENH: Slicer 4.3.1-1

Revision 22600 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 4 09:33:12 2013 UTC (4 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48013 byte(s)
Diff to previous 22466
ENH: Sync patch version to match latest stable release

See commit r22599 on Slicer-4-3 branch.

Revision 22466 - (view) (download) (annotate) - [select for diffs]
Modified Sun Sep 22 02:45:02 2013 UTC (4 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48013 byte(s)
Diff to previous 22409
COMP: Simplify Qt version requirement rules

As explained in issue #3325, on linux to prevent a crash occurring when
a page is loaded in a QWebView, at least Qt 4.8.1 is needed
on Ubuntu 13.04. Alberto also reported it is crashing when using
Ubuntu 12.04 (see #3394).

To prevent developer from having to explicitly pass
the Slicer_REQUIRED_QT_VERSION option, the requirement scheme
has been simplified.

Removed non working option "Slicer_EXPERIMENTAL_QT_VERSION" and requires
at least Qt 4.7.4 on all platform.

This revert commit r21743 and partially revert r21727

We will discuss with the community if it makes sens to required Qt >= 4.8.1
on all platform. On MacOSX, this implies that Leopard won't be supported
anymore.

Revision 22409 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 4 11:07:57 2013 UTC (4 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48055 byte(s)
Diff to previous 22408
ENH: Begin post-4.3.0 development

Revision 22408 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 4 10:48:37 2013 UTC (4 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48054 byte(s)
Diff to previous 22407
ENH: Slicer 4.3.0

Revision 22407 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 4 10:48:34 2013 UTC (4 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48055 byte(s)
Diff to previous 22294
ENH: Update Documentation to 4.3

Revision 22294 - (view) (download) (annotate) - [select for diffs]
Modified Mon Aug 19 14:53:22 2013 UTC (4 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48059 byte(s)
Diff to previous 22228
BUG: Sync patch version to match latest stable release

The difference was explained by the fact the patch and tweak release have
been made of dedicated SVN branch with backporting commit from trunk,
the increase of tweak/patch number didn't make it back to the trunk.

This commit will minimize confusion for user by ensuring both the latest
stable release and the current nightly have the same major/minor/patch
version numbers.

Also added an entry to the post-release task list.
See http://www.slicer.org/slicerWiki/index.php/Documentation/Nightly/Developers/Versioning#post_release

Fixes #3265

Revision 22228 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 22 20:23:58 2013 UTC (4 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48059 byte(s)
Diff to previous 22220
COMP: Disable OpenSSL support by default

This commit ensures the OpenSSL support is disabled by default as claimed
within the commit message associated to r22220.

Discussion: http://slicer-devel.65872.n3.nabble.com/Windows-build-fails-due-to-missing-QSslSocket-class-tt4029446.html#a4029460

Thanks Greg Sharp for reporting the issue.

Revision 22220 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jul 20 02:16:35 2013 UTC (4 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 48058 byte(s)
Diff to previous 22201
ENH: Add SSL support

Having the application interacting with services or downloading resources
served over https protocol is now required. More particularly,
it became necessary to access resources stored on Github (extension
manager - issue #2354) or to download python packages from pip server
at run time.

The CMake option "Slicer_USE_PYTHONQT_WITH_OPENSSL" allowing to enable or
disable OpenSSL support has been introduced is set to OFF by default.

Building OpenSSL
================

On Windows, since Perl is required, OpenSSL binaries have been
generated and uploaded on kitware packages server. See [1]

The project allowing to re-generate the Windows OpenSSL archive is currently
hosted here [2].

On unix-like system, OpenSSL is built has part of the Superbuild. To ensure
is can be built in parallel, a patch is also applied [3].

Finally, since python is built with OpenSSL support, the python launcher
is now configured on all platform so that python can properly load the built
OpenSSL shared library when it is used to build project like numpy.

[1] http://packages.kitware.com/packages/application/view?applicationId=20
[2] https://gist.github.com/jcfr/6030240
[3] https://raw.github.com/Alexpux/Qt-builds/master/patches/openssl/openssl-1.0.1-parallel-build.patch

OpenSSL support in Qt, python, curl
===================================

Practically, it means that library like Qt, python, curl need to be
built with OpenSSL support.

This commit only address OpenSSL support for Python and Qt.

Curl support is not yet enabled.

For Qt OpenSSL support, Qt has to be built with the flags:
  -openssl
  -I /path/to/OpenSSL/include
  -L /path/to/OpenSSL/lib

On unix-like system, available binaries are already OpenSSL ready, Qt
has to be explicitly built only on windows. On windows, Qt will have to
be built.

Certificates
============

In case X.509v3 certificates are available on the system where Slicer is
executed, a certificate bundle "Slicer.crt" is also provided. The set of
scripts allowing to generate the bundle are provided by BLFS
(Beyond Linux From Scratch).
More details in Base/QTCore/Resources/Certs/README

Application integration
=======================

The Slicer core application will load the Slicer.crt bundle if needed.

qSlicerExtensionsInstallWidget now derives from a re-usable widget
named qSlicerWebWidget.

qSlicerSslTest has been added to check that "https" connection can
be established using Qt library.

Fixes #2998
Fixes #2355
Fixes #2354

Revision 22201 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 16 19:52:28 2013 UTC (4 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47937 byte(s)
Diff to previous 22185
ENH: adding SimpleFilters as internal modules via externalproject

Following the example of MultiVolumeImporter, a new external project
was added to download the SimpleFilters repository, the source
directory is propagated into the Slicer project and it is added as a
sub-directory to the build in scripted modules.

From: Bradley Lowekamp <blowekamp@mail.nih.gov>

Revision 22185 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jul 13 19:46:46 2013 UTC (4 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47747 byte(s)
Diff to previous 22144
COMP: Ensure external module can directly find Slicer

Following commit r22063, extensions bundled using Slicer_EXTENSION_SOURCE_DIRS
didn't have to use the "if(NOT Slicer_SOURCE_DIR)" safeguard.

This commit move inclusion of external modules from the CLI, Loadable
and Scripted sub-directories into a single "Modules/Remote" folder
included after Slicer_DIR so that external module can also directly call
"find_package(Slicer)"

Thanks to Brad Lowekamp for reporting the issue.

Revision 22144 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jul 6 04:17:29 2013 UTC (4 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47529 byte(s)
Diff to previous 22133
COMP: Enable MultiVolumeImporter only if Numpy support is enabled

Since the module depends on numpy, excluding the module will avoid
startup error when the module is loaded when numpy support is disabled.

A better approach could consist in teaching the module how to detect if
numpy is available and fail graciously by reporting a warning. A issue has
been reported upstream. See https://github.com/fedorov/MultiVolumeImporter/issues/6

Co-authored-by: Chrystel Juan <chrystel.juan@kitware.com>

Revision 22133 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 3 22:12:40 2013 UTC (4 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 47508 byte(s)
Diff to previous 22066
COMP: Adding option for SimpleITK as a shared library

SimpleITK has large internal libraries, which take an extremely long
time to link on windows when they are static. Creating shared
SimpleITK internal libraries can reduce linking time. Also the size
of the debug libraries are monstrous. Using shared libraries for
debug, reduce disc requirements, and can improve linking
times. However, these shared libraries take longer to load than the
monolithic target from static libraries.

This commits updates the build system:
1) Propagate SimpleITK_DIR into Slicer config.
2) Add SimpleITK lib path to runtime library path for build.
3) Add SimpleITK to be installed as a cmake project.
4) Add CMake variable Slicer_USE_SimpleITK_SHARED to turn on SimpleITK
as a shared library.

Co-authored-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

From: Bradley Lowekamp <blowekamp@mail.nih.gov>

Revision 22066 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 30 05:34:23 2013 UTC (4 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46645 byte(s)
Diff to previous 22065
STYLE: Easier distinction of bundled extension configure step

Simply display a separator between configured extension.

Revision 22065 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 30 05:34:20 2013 UTC (4 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46574 byte(s)
Diff to previous 22063
ENH: Accept trailing "/" for path passed using extension source dirs

Revision 22063 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 30 05:34:17 2013 UTC (4 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46494 byte(s)
Diff to previous 22041
ENH: Do not require "if(NOT Slicer_SOURCE_DIR)" in extension

Before this commit, to allow extension or module to be bundled
directly within Slicer by setting the variable
Slicer_EXTENSION_SOURCE_DIRS, it was required to explicitly exclude
the call to:
 find_package(Slicer ...)
 include(${Slicer_USE_FILE})
 include(${Slicer_EXTENSION_CPACK})
by check if Slicer_SOURCE_DIR was set .

This commit improves the build system so that making this
call is a no-op when bundling modules or extensions.

This will allow extension developer to write simpler CMakeLists.txt



Before:

cmake_minimum_required(VERSION 2.8.9)

if(NOT Slicer_SOURCE_DIR)
  find_package(Slicer COMPONENTS ConfigurePrerequisites)
endif()

if(NOT Slicer_SOURCE_DIR)
  set(EXTENSION_NAME EmptyExtensionTemplate)
  set(EXTENSION_HOMEPAGE "http://www.slicer.org/slicerWiki/index.php/Documentation/Nightly/Extensions/EmptyExtensionTemplate")
  set(EXTENSION_CATEGORY "Examples")
  set(EXTENSION_CONTRIBUTORS "Jean-Christophe Fillion-Robin (Kitware)")
  set(EXTENSION_DESCRIPTION "This is an example of extension bundling N module(s)")
  set(EXTENSION_ICONURL "http://viewvc.slicer.org/viewvc.cgi/Slicer4/trunk/Extensions/Testing/EmptyExtensionTemplate/EmptyExtensionTemplate.png?revision=21746&view=co")
  set(EXTENSION_SCREENSHOTURLS "http://wiki.slicer.org/slicerWiki/images/4/42/Slicer-r19441-EmptyExtensionTemplate-screenshot.png")
endif()

if(NOT Slicer_SOURCE_DIR)
  find_package(Slicer REQUIRED)
  include(${Slicer_USE_FILE})
endif()


add_subdirectory(ModuleA)

if(NOT Slicer_SOURCE_DIR)
  include(${Slicer_EXTENSION_CPACK})
endif()




After:

cmake_minimum_required(VERSION 2.8.9)

find_package(Slicer COMPONENTS ConfigurePrerequisites)

project(EmptyExtensionTemplate)

set(EXTENSION_HOMEPAGE "http://www.slicer.org/slicerWiki/index.php/Documentation/Nightly/Extensions/EmptyExtensionTemplate")
set(EXTENSION_CATEGORY "Examples")
set(EXTENSION_CONTRIBUTORS "Jean-Christophe Fillion-Robin (Kitware)")
set(EXTENSION_DESCRIPTION "This is an example of empty extension")
set(EXTENSION_ICONURL "http://viewvc.slicer.org/viewvc.cgi/Slicer4/trunk/Extensions/Testing/EmptyExtensionTemplate/EmptyExtensionTemplate.png?revision=21746&view=co")
set(EXTENSION_SCREENSHOTURLS "http://wiki.slicer.org/slicerWiki/images/4/42/Slicer-r19441-EmptyExtensionTemplate-screenshot.png")

find_package(Slicer REQUIRED)
include(${Slicer_USE_FILE})

add_subdirectory(ModuleA)

include(${Slicer_EXTENSION_CPACK})

Revision 22041 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 27 18:05:48 2013 UTC (4 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45805 byte(s)
Diff to previous 22029
COMP: Reduce number of copy/compile python targets

Set variable CTK_COMPILE_PYTHON_SCRIPTS_GLOBAL_TARGET_NAME
to "Slicer" to create targets:
  CopySlicerPythonResourceFiles
  CopySlicerPythonScriptFiles
  CompileSlicerPythonFiles

Before this commit, for each set of script processed directly or
indirectly by the macro "ctkMacroCompilePythonScript", two targets
are created. For example:

[...]
CopyAAAPythonFiles
CopyAAAPythonResourceFiles
CompileAAAPythonFiles
[...]
CopyBBBPythonFiles
CopyBBBPythonResourceFiles
CompileBBBPythonFiles
[...]
CopyCCCPythonFiles
CompileCCCPythonFiles
[...]

After integrating the commit, independently of the number
of set of scripts, within Slicer core the following three
targets will be available:

  CopySlicerPythonResourceFiles     [If there are python resources]
  CopySlicerPythonScriptFiles
  CompileSlicerPythonFiles

Note that this will apply only for Slicer core, by default,
if an extension bundles 2 scripted modules, the following targets
will be available:

  CopyModule1PythonScriptFiles
  CompileModule1PythonFiles

  CopyModule2PythonResourceFiles
  CopyModule2PythonScriptFiles
  CompileModule2PythonFiles

Revision 22029 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 22 22:02:30 2013 UTC (4 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45454 byte(s)
Diff to previous 22023
COMP: Use qRestAPI instead of deprecated qMidasAPI project

In addition to provide Midas support, qRestAPI also provides
support for XNat (qXnatAPI.h)

See https://github.com/commontk/qRestAPI

Revision 22023 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 17 22:05:19 2013 UTC (4 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45457 byte(s)
Diff to previous 21997
BUG: Ensure library can be loaded from different place using @rpath

Before this commit, attempt have been made (r18311, r18325, r18581) to
install both built-in CLI and extension CLI executable in a folder
located at some depth of the main Slicer executable. This was needed
because all libraries were referenced based on the location of the main
Slicer executable using "@executable_path". This was working *only* in the
case of built-in CLI but wasn't scaling very well for the extension CLI
executable. Indeed, being able to both differentiate the different
installed extension and keeping the depth to 1 level wasn't easily
feasible:

  /path/to/Slicer.app/Contents/MacOS/Slicer
  /path/to/Slicer.app/Contents/cli-modules/MyCLI
  /path/to/Slicer.app/Contents/Extensions-21855/SkullStripper/cli-modules/MyCLI

A solution could have been to install extensions directly in "Slicer.app"
folder and update the cli install sub dir to get something like:

  /path/to/Slicer.app/Extensions-21855/SkullStripper/MyCLI

While possible, it would have remain a special case to maintain.

Instead, by using "@rpath", CLI modules can now be installed in the Slicer
standard location "Slicer_CLIMODULES_LIB_DIR" instead of "Slicer_CLIMODULES_SUBDIR".
This commit remove the special case which never worked (issue #3051)

Waiting the topic "tweak-bundleutilities-for-rpath" is fully matured and
integrated in CMake, use custom version of BundleUtilities and GetPrerequisites.
See http://cmake.org/gitweb?p=stage/cmake.git;a=shortlog;h=refs/heads/tweak-bundleutilities-for-rpath

Since our custom version of the CMake modules now consider "~/usr/.*/lib",
the implementation of "gp_resolved_file_type_override" has been removed.

Remove the hack specific to LibArchive (introduced by commit r19615), since
the library is fixed up using the default library matching pattern, it
will be installed in the expected location.

SlicerExecutionModel has also been updated to link the CLI executable
and library with "-rpath" so that they can resolve the location of Slicer
libraries.

Revision 21997 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 14 22:29:23 2013 UTC (4 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46654 byte(s)
Diff to previous 21996
COMP: Fix unused CMake variable warning related to DOCUMENTATION_* variable

Revision 21996 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 14 22:29:21 2013 UTC (4 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46710 byte(s)
Diff to previous 21963
COMP: Fix CMake warning related to WITH_MEMCHECK CMake variable

Commented the variable waiting the build system is updated to support
running of the test using valgrind.

Revision 21963 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 1 04:45:20 2013 UTC (4 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46709 byte(s)
Diff to previous 21912
COMP: Use internally consistent zlib

The zlib libraries are used by many differnt packages
includeing ITKv4, LibArchive, VTK, python, and teem.

This patchset builds a single version of zlib
that is mangled with a slicer namespace, and uses
that one library for all zlib operation through the
"USE_SYSTEM_ZLIB" options.

The mangling for vtk_zlib is disabled for teem because
it is not needed when using the External_zlib build.

From: Hans Johnson <hans-johnson@uiowa.edu>

Revision 21912 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 24 13:45:21 2013 UTC (4 years, 5 months ago) by sankhesh
Original Path: trunk/CMakeLists.txt
File length: 46473 byte(s)
Diff to previous 21896
ENH: Added safeguard hook to tell developer to setup environment

A placeholder pre-commit hook is installed by CMake to ensure the developer sets
up the development environment before committing any changes.
Addresses issue 2834.

Revision 21896 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 17 20:20:53 2013 UTC (4 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46186 byte(s)
Diff to previous 21895
STYLE: Change configure time message to use main application name.

If SlicerApp_APPLICATION_NAME is set to "Foo", message like the following
will be displayed instead:

-- Configuring Foo version [4.2.0-2013-04-16]
-- Configuring Foo revision [21891]
-- Configuring Foo for [linux-amd64]

Revision 21895 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 17 20:20:52 2013 UTC (4 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46112 byte(s)
Diff to previous 21890
STYLE: Display Slicer revision at configuring time. Fixes #2020

See http://www.na-mic.org/Bug/view.php?id=2020

Revision 21890 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 16 17:09:01 2013 UTC (4 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 46019 byte(s)
Diff to previous 21889
COMP: Set "Slicer_LANGUAGES" global property only if i18n support is enabled

Prevent confusion and make global property definition consistent.

Revision 21889 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 16 17:08:59 2013 UTC (4 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45977 byte(s)
Diff to previous 21865
STYLE: Remove extra space in CMakeLists.txt

Revision 21865 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 5 03:20:20 2013 UTC (4 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45979 byte(s)
Diff to previous 21856
COMP: Do not include or use i18n macros if Slicer_BUILD_I18N_SUPPORT is OFF

Commit r21856 disabled internationalization support by default and
it introduced the option Slicer_BUILD_I18N_SUPPORT allowing to enable it.

This commit takes care of excluding the associated CMake macro and its
invocation if the option is disabled.

Revision 21856 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 2 18:16:44 2013 UTC (4 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45938 byte(s)
Diff to previous 21794
COMP: Add option allowing to enable internationalization support.

STATUS
 Internationalization support has been discussed during March 26th 2013
developer hangout.

 We reach consensus: Official support for i18n will be disabled. A CMake
option named Slicer_BUILD_I18N_SUPPORT will be added and the option
won't be actively supported or tested.

 Why? Supporting internationalization properly would require to test
all ITK/VTK/Teem/.. readers and we don't have the funding or resources
to support that effort. If it is something you are interested in, make
sure to drop an email on the developer list. We will be happy to provide
 more information.

DISCUSSION
 http://slicer-devel.65872.n3.nabble.com/Re-Rounding-to-integer-tt4027985.html
 http://slicer-devel.65872.n3.nabble.com/Re-slicer-users-Slicer4-can-t-really-use-it-yet-td4028040.html
 http://slicer-users.65878.n3.nabble.com/Slicer4-DICOM-many-problems-td4025919.html

ISSUES
 3029 - Image spacing not read correctly in Slicer 4.2.2

Revision 21794 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 12 11:20:11 2013 UTC (4 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45804 byte(s)
Diff to previous 21783
COMP: Update Slicer test macros to support ExternalData

Revision 21783 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 5 23:18:47 2013 UTC (4 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45397 byte(s)
Diff to previous 21774
STYLE: Remove redundant comment appended to SlicerTargets.cmake

Revision 21774 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 24 20:38:48 2013 UTC (4 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45433 byte(s)
Diff to previous 21769
COMP: Update system to use CMake built-in macro "cmake_parse_arguments"

SLICER_PARSE_ARGUMENTS has been kept around but will display an error
message if it used by some extension. That will give the opportunity
for extension maintainer to update their CMakeLists.txt.

Considering that the file "CMakeParseArguments" is also included in the
code base associated with Slicer 4.2.2-1, simply updating the extension
so that "cmake_parse_arguments" is used will be sufficient. Say differently,
CMakeLists.txt maintained for both extension build against Slicer nightly
and Slicer 4.2.2-1 won't diverge.

Revision 21769 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 22 07:53:27 2013 UTC (4 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45468 byte(s)
Diff to previous 21727
ENH: Add SlicerMacroConfigureModuleCxxTestDriver to simplify test configuration

This macro will take care of:
  - creating the test driver executable. Using "SOURCES"
  - setting the appropriate properties
  - optionally linking to additional libraries. If "TARGET_LIBRARIES" is passed.
  - optionally including list of directories. If "INCLUDE_DIRECTORIES" is passed.
  - enabling VTK debug leaks detection if "WITH_VTK_DEBUG_LEAKS_CHECK" is passed.

It can also return the list of test to run if "TESTS_TO_RUN_VAR" is set.

This macro will make maintenance of testing framework easier and more
consistent.

The other advantages is that the content of the CMakeLists.txt declaring
tests is simpler and easier to understand.

Revision 21727 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 16 23:45:33 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45417 byte(s)
Diff to previous 21725
COMP: Add experimental support for Qt 4.8.4

The build system now checks with the discovered Qt version is either
Qt 4.7.4 or Qt 4.8.4.

Revision 21725 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 16 19:43:07 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45389 byte(s)
Diff to previous 21723
COMP: Fix missing "itkFactoryRegistrationConfigure.h" build error

This will fix build errors of the form:

../ITKFactoryRegistration/itkFactoryRegistration.h:6:45: error: itkFactoryRegistrationConfigure.h: No such file or directory
../Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx:49:
../Libs/ITKFactoryRegistration/itkFactoryRegistration.h:10: error: expected constructor, destructor, or type conversion before 'void'
../Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx: In function 'int vtkMRMLSliceLogicTest2(int, char**)':
../Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx:56: error: 'itkFactoryRegistration' is not a member of 'itk'


Follow-up of commit r21723

Revision 21723 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 16 09:21:34 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45320 byte(s)
Diff to previous 21722
COMP: Ensure ITKFactoryRegistration is considered when setting ITK_INCLUDE_DIRS at top-level.

This will fix build errors of the form:

.../Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx:49:38: error: itkFactoryRegistration.h: No such file or directory
.../Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx: In function 'int vtkMRMLSliceLogicTest2(int, char**)':
.../Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx:56: error: 'itkFactoryRegistration' is not a member of 'itk'

Revision 21722 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 16 02:38:39 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45303 byte(s)
Diff to previous 21721
COMP: Remove build system option related to ChangeTracker

Follow up of commit r21716

Revision 21721 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 16 02:38:34 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45503 byte(s)
Diff to previous 21688
BUG: Ensure ITKv4 IO Factory are registered within tests

* Include directories associated with ITKFactoryRegistration are also
appended to ITK_INLCUDE_DIRS to ensure that the method itk::itkFactoryRegistration
could be called.

* Code allowing to register the factory has been manually added to the
tests.

* Would it make sens to have this library ITKFactoryIORegistration
being built/provided by ITKv4 proper ?

See #2813 - http://www.na-mic.org/Bug/view.php?id=2813
See #2951 - http://www.na-mic.org/Bug/view.php?id=2951

Revision 21688 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 11 22:50:21 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45432 byte(s)
Diff to previous 21682
COMP: Set ITKv4 as default version. Update SimpleITK version to v0.6.1

Thanks to the work of the ITK, Slicer and DCMTK community members :),
the default version of ITK built wihtin Slicer will be:

   ITK 4.3 based of commit c31337 (01-06-2013)


Remarks
=======

- While this is a major change from the developer perspective, from
the user perspective, we expect the functionality to behave similarly
or better.  That is why we maintained the major version number to "4".


- In your EXISTING build tree, consider:

      a) manually updating the CMake option ITK_VERSION_MAJOR from 3 to 4

      b) deleting ITKv3* directories. That would help minimizing future
         confusion.


- Extensions superbuild-ing ITKv4 SHOULD be updated.


- It is known that some test are failing exclusively with ITKv4,
these ones will be addressed by the respective module/code maintainers.
See [1] for more details.


- Test have been done to ensure the extension build system was behaving
as expected when using ITKv4. That said, it is possible we experience
some glitch. Make sure to report any issue so that we can solve them
as soon as possible.


- Issue building extension depending on DCMTK has been identified.
For example, extension "houghTransformCLI" failed to build. This will
be addressed as soon as possible by working with ITKv4 and DCMTK
community.


- Enabling SimpleITK is *NOT* enabled by default and has *NOT* been
tested. That said, if you enable the option Slicer_USE_SimpleITK,
the latest version of SimpleITK will be built.


- On windows, if you encounter strange link/build error. Consider
running the following script. We are in the process of identifying
what would be the optimum build and source folder length and your
help and comments are welcome.
See https://github.com/jcfr/list-longest-paths#readme


[1] https://docs.google.com/a/kitware.com/spreadsheet/ccc?key=0AqcFo-C6Ob4-dFJRdWw3LVN6R1VYQlotNXRVaGVVT1E#gid=0

Revision 21682 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 11 02:27:57 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45432 byte(s)
Diff to previous 21638
COMP: Simplify how arguments are passed to PackageAndUploadExtensions script

Parameter are now written into files like:
  <extension-name>-test-command-args.cmake
  <extension-name>-upload-command-args.cmake
  <extension-name>-upload-only-command-args.cmake

This file are then passed to the ctest using argument:

   -DSCRIPT_ARGS_FILE:FILEPATH=<path-to-args-file>

and include within the ctest script using:

   include(${SCRIPT_ARGS_FILE})

This approach has the advantages of:
  1) being simpler in the sens it avoids escaping arguments
  2) preventing issue related to the command line length on windows by passing
arguments "through a file"

See #2491 - http://www.na-mic.org/Bug/view.php?id=2491

Revision 21638 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 25 09:06:34 2013 UTC (4 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45432 byte(s)
Diff to previous 21612
COMP: Remove WebGLExport module from Slicer core - Will be distributed as extension.

See https://github.com/xtk/SlicerWebGLExport/pull/2

Revision 21612 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 18 00:00:33 2013 UTC (4 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45609 byte(s)
Diff to previous 21598
COMP: Ensure EMSegment is build with default option and available in nightly package.

This commit ensures that "Slicer_BUILD_EMSegment" is properly set after
the first CMake configuration

Following r21598, the option "Slicer_BUILD_BRAINSTOOLS" has been moved after
declaring the option "Slicer_BUILD_EMSegment". Since option "Slicer_BUILD_EMSegment"
is depending on the value of Slicer_BUILD_BRAINSTOOLS, Slicer_BUILD_QTLOADABLEMODULES and
Slicer_USE_PYTHONQT, EMSegment wasn't build by default.

Thanks to Ron Kikinis for reporting the issue.

Revision 21598 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 11 21:30:30 2013 UTC (4 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45609 byte(s)
Diff to previous 21595
ENH: Update ITK and DCMTK to support DWIConvert provided by BRAINSTools

By adding DWIConvert to BRAINSTools, the logic necessary to support
this tool becames much simpler.  It will also reduce the burden
of maintainance.

The DWIConvert program was originally building a private version
of the ITKv4 DCMTK interface.

From: Hans Johnson <hans-johnson@uiowa.edu>

Revision 21595 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 11 21:30:14 2013 UTC (4 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 45753 byte(s)
Diff to previous 21592
COMP: Explicitly list ITK component in attempt to reduce link command length

In find_package(ITK ...) specify the modules that will be used. This
reduces the number of libraries specified on the link command and
help reduces linking errors.

ITKv4 provides a script allowing to discover the list of ITK components.
See ./Utilities/Maintenance/WhatModulesITK.py

Contributed by Matt McCormick and Jean-Christophe Fillion-Robin

From: Matt McCormick <matt.mccormick@kitware.com>

Revision 21592 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 11 21:29:52 2013 UTC (4 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 44287 byte(s)
Diff to previous 21558
COMP: Add ITKFactoryRegistration library centralizing ITK IO factory registration

This commit will ensure that ITK IO factory are properly registered on all
supported platforms.

When ITKv4 is build shared, the library holding the factory registration code
are build statically. As a consequence, when CLI module are loaded as library
the factory are registered multiple times. Around 800 factories where registered
and this was leading to poor performance when loading images.

This commit enable the building of a shared library named ITKFactoryRegistration
that should be linked against to ensure loading of the factory. This approach
can succeed thanks to the help of the ITK variable ITK_NO_IO_FACTORY_REGISTER_MANAGER.

This variable allow to disable the automatic registration of factory in selected part
of the code.

The following two cases are handled:
 - Registration of the factories within the Slicer executable.
 - Registration of the factories within CLI executable.

Fixes #2813

From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

Revision 21558 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 31 21:04:35 2012 UTC (4 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 43958 byte(s)
Diff to previous 21550
COMP: add_subirectory(${Slicer_APPLICATIONS_DIR} ...) failed

when Slicer_APPLICATIONS_DIR was defined but empty

Revision 21550 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 31 12:48:48 2012 UTC (4 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 43966 byte(s)
Diff to previous 21549
ENH: Add support for external projects passed as configuration parameter

Revision 21549 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 31 12:48:38 2012 UTC (4 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 44670 byte(s)
Diff to previous 21548
ENH: Add Slicer_BUILD_DIFFUSION_SUPPORT

Controls whether Diffusion related modules are built or not.
It concernes all the DWI, DTI and Tractography modules.

Revision 21548 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 31 12:48:26 2012 UTC (4 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 44579 byte(s)
Diff to previous 21482
ENH: Make the applications to build customizable

By passing Slicer_APPLICATIONS_DIR, the applications to build can be
changed.

Revision 21482 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 7 00:23:59 2012 UTC (4 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 43558 byte(s)
Diff to previous 21443
ENH: Support per user per revision extensions settings

There is now a clear distinction between:
 - userSettings -> i.e. ~/.config/NA-MIC/Slicer.ini
 - revisionUserSettings -> i.e. ~/.config/NA-MIC/Slicer-<revision>.ini

The following slicer settings are now revision specific:
 - Extensions/ManagerEnabled
 - Extensions/ServerUrl
 - Extensions/InstallPath
 - Modules/AdditonalPath
 - Modules/IgnoreModules

Additionally, the launcher version has also been updated to be able to
consider settings associated with a user, application and revision. This is
captured by the new parameter APPLICATION_REVISION, ORGANIZATION_DOMAIN,
ORGANIZATION_NAME and USER_ADDITIONAL_SETTINGS_FILEBASENAME passed to the CMake
function "ctkAppLauncherConfigure".

qSlicerCoreApplication API has also been extended and now includes methods
like:
  - QSettings* userSettings()  [settings() method is deprecated and kept for backward compatibility]
  - QSettings* revisionUserSettings()
  - QString launcherRevisionUserSettingsFilePath()
  - QString slicerUserSettingsFilePath()
  - QString slicerRevisionUserSettingsFilePath()

In addition to the settings, the extensions install path is also revision
specific, it means that it's now possible to have multiple version of slicer
running with different set of extensions.

Fixes #2791, #2143, #2720, #2533


Since the version of the launcher is updated, launcher will return EXIT_FAILURE
also when no application is been set in the launcher settings.

Fixes #2767

Revision 21443 - (view) (download) (annotate) - [select for diffs]
Modified Mon Nov 19 00:00:53 2012 UTC (4 years, 11 months ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 42953 byte(s)
Diff to previous 21299
ENH: Added DWIConvert

Revision 21299 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 31 21:06:45 2012 UTC (4 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42718 byte(s)
Diff to previous 21298
ENH: Begin post-4.2.0 development

Revision 21298 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 31 21:04:26 2012 UTC (4 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42717 byte(s)
Diff to previous 21295
ENH: Slicer 4.2.0

Revision 21295 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 31 14:28:36 2012 UTC (4 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42717 byte(s)
Diff to previous 21267
COMP: Add sanity check preventing building from source or build directory with spaces

If needed, this check can be by-passed passing option
-DSlicer_SKIP_DIR_WITH_SPACES_CHECK:BOOL=TRUE

Revision 21267 - (view) (download) (annotate) - [select for diffs]
Modified Sat Oct 27 20:58:42 2012 UTC (4 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42529 byte(s)
Diff to previous 21229
COMP: Consider executable suffix when setting Slicer_LAUNCHER_EXECUTABLE

Fix EMSegment tests failing on windows with the following error message:

  "error: Failed to obtain launcher executable name !"

The concerned tests are:
  EMSegCL_RunDefaultNodes
  EMSegCL_RunSetEverything
  EMSeg_MRML_DiffDefaultNodes
  EMSeg_MRML_DiffReadWriteNodes

Revision 21229 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 23 18:00:10 2012 UTC (4 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42503 byte(s)
Diff to previous 21228
ENH: Begin post-4.2.0-rc1 development

Revision 21228 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 23 18:00:08 2012 UTC (4 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42502 byte(s)
Diff to previous 21200
ENH: Slicer 4.2.0-rc1

Revision 21200 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 16 19:39:23 2012 UTC (5 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 42504 byte(s)
Diff to previous 21167
BUG: Fix windows assert associated with extension tests

To ensure existing tests pass, the Cxx folder has been added to the list
of sub dirs to consider when looking up IntDir.

That said, the recommended solution is to set the target property
RUNTIME_OUTPUT_DIRECTORY for the test executable. The value of this property
should be ${CMAKE_BINARY_DIR}/${Slicer_BIN_DIR}

See http://na-mic.org/Mantis/view.php?id=2348

Fixes #2348

Revision 21167 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 12 19:00:03 2012 UTC (5 years ago) by sankhesh
Original Path: trunk/CMakeLists.txt
File length: 42462 byte(s)
Diff to previous 21158
BUG: 2321 Should not check on Mac machines

The linker ld for OSX does not have --as-needed and --no-as-needed
flags.

Revision 21158 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 11 16:00:51 2012 UTC (5 years ago) by sankhesh
Original Path: trunk/CMakeLists.txt
File length: 42448 byte(s)
Diff to previous 21112
BUG: 2321 Added a check for linker capabilities

Checks whether the linker will be able to resolve all symbols. If the
check fails, another test takes place to make sure the linker is not
lazy-linking. If it is, the flag --no-as-needed is added to
CMAKE_EXE_LINKER_FLAGS.

Revision 21112 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 5 14:39:27 2012 UTC (5 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41969 byte(s)
Diff to previous 21052
COMP: Fix CDash errors/warnings reporting for unix parallel build

Setting the variable CTEST_USE_LAUNCHERS_DEFAULT in the environment
to enable CTest launcher reliably will be supported by default in either
CMake 2.8.10 or 2.8.11.

In the mean time, your local installation of CMake can be modified based on
the following topic: https://github.com/jcfr/CMake/tree/fix-ctest-use-launchers-for-superbuild

See http://na-mic.org/Mantis/view.php?id=2468

Fixes #2468

Revision 21052 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 26 14:25:02 2012 UTC (5 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41774 byte(s)
Diff to previous 21045
COMP: Ensure QTApp library can use Module/Core headers

See #2251 / http://www.na-mic.org/Bug/view.php?id=2251

Revision 21045 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 25 22:20:23 2012 UTC (5 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41714 byte(s)
Diff to previous 20960
ENH: Factor code allowing to setup factory manager into library SlicerBaseQTApp

See http://www.na-mic.org/Bug/view.php?id=2251

Partial fix for #2251

Revision 20960 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 10 18:57:45 2012 UTC (5 years, 1 month ago) by sankhesh
Original Path: trunk/CMakeLists.txt
File length: 41714 byte(s)
Diff to previous 20959
BUG: EMSegment and MultiVolumeExplorer not built without PythonQt

This fixes issue #2458.
EMSegment and MultiVolumeExplorer should not be built without PythonQt.
Made changes as per jcfr's suggestions.

Revision 20959 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 10 18:57:43 2012 UTC (5 years, 1 month ago) by sankhesh
Original Path: trunk/CMakeLists.txt
File length: 41706 byte(s)
Diff to previous 20849
BUG: EMSegment and MultiVolumeExplorer not built without PythonQt

EMSegment and MultiVolumeExplorer are dependent on Python Qt and hence
should are not built if Slicer_USE_PYTHONQT is turned OFF while
configuring Slicer with CMake.

Revision 20849 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 23 22:47:22 2012 UTC (5 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41666 byte(s)
Diff to previous 20661
COMP: Use variable Slicer_BINARY_INNER_SUBDIR instead of hard-coding "Slicer-build"

See http://www.na-mic.org/Bug/view.php?id=2390

Fixes #2390

Revision 20661 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 24 06:45:27 2012 UTC (5 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41620 byte(s)
Diff to previous 20648
COMP: Ensure CMake options can be overwritten during initial configuration

The file "SlicerOverwriteDefaultOptions.cmake" was included after defining
dependent options. It means that CMake option depending on
overwritten value were properly set only after a second configuration.

Revision 20648 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 20 17:33:40 2012 UTC (5 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41541 byte(s)
Diff to previous 20597
COMP: Fix last python26_d link errors ensuring PYTHONQT_USE_RELEASE_PYTHON_FALLBACK is defined in Slicer

See http://massmail.spl.harvard.edu/public-archives/slicer-devel/2012/009521.html
and https://github.com/commontk/CTK/issues/203

Revision 20597 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 10 14:32:00 2012 UTC (5 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41317 byte(s)
Diff to previous 20596
BUG: Ensure "Slicer_USE_PYTHONQT" is considered during the first configuration

Thanks to Brad Lowekamp for reporting this issue :)

Since option "Slicer_BUILD_QTSCRIPTEDMODULES" was depending on Slicer_USE_PYTHONQT
it is important to define it first. At least run of cmake were required
to ensure that "Slicer_BUILD_QTSCRIPTEDMODULES" was properly set.

Revision 20596 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 10 14:31:58 2012 UTC (5 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41320 byte(s)
Diff to previous 20595
STYLE: Move "Slicer_UPDATE_TRANSLATION" into the "General Slicer option" section

Revision 20595 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 10 14:31:57 2012 UTC (5 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41320 byte(s)
Diff to previous 20576
COMP: Ensure all external project option can be overwritten

Revision 20576 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 5 22:45:53 2012 UTC (5 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 41213 byte(s)
Diff to previous 20514
ENH: Extensions can now be built with Slicer proper

Assuming the top-level folder name matches the extension name, it is now
possible to configure Slicer so that it also builds a chosen set of
extension source directories. If a package is generated,
these extensions will also be packaged.

Configuring Slicer passing the option "Slicer_EXTENSION_SOURCE_DIRS" will
achieve the desired goal.

For example, if we want to bundle within Slicer extensions "MinimalistiCli" and "SkullStripper",
the following could be done:

 cmake -DSlicer_EXTENSION_SOURCE_DIRS:STRING=/home/jchris/Projects/MinimalistiCli\;/home/jchris/Projects/SkullStripper .

The associated build tree will then be located in:
  /path/to/Slicer-Superbuild-Release/Slicer-build/Extensions/MinimalistiCli and
/path/to/Slicer-Superbuild-Release/Slicer-build/Extensions/SkullStripper

See http://na-mic.org/Mantis/view.php?id=2293

Fixes #2293

Revision 20514 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 28 20:40:21 2012 UTC (5 years, 3 months ago) by benjamin.long
Original Path: trunk/CMakeLists.txt
File length: 40235 byte(s)
Diff to previous 20510
ENH: Internationalized Slicer

Added Internationalization setting panel to enable/disable this behavior.
Added language combo box into general setting panel if enabled.
Added function to load language when we start the application.

Revision 20510 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 28 18:16:45 2012 UTC (5 years, 3 months ago) by demian
Original Path: trunk/CMakeLists.txt
File length: 39428 byte(s)
Diff to previous 20505
ENH: Added a script to setup the slicer environment

Revision 20505 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 27 23:05:24 2012 UTC (5 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39382 byte(s)
Diff to previous 20393
COMP: Add option Slicer_BUILD_DICOM_SUPPORT

See http://na-mic.org/Mantis/view.php?id=2271

Fixes #2271

Revision 20393 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 18 07:40:03 2012 UTC (5 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39310 byte(s)
Diff to previous 20348
COMP: Slicer CLIs can now be built using SEMMacroBuildCLI macro

Revision 20348 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 11 19:07:49 2012 UTC (5 years, 4 months ago) by Michael.jeulinl
Original Path: trunk/CMakeLists.txt
File length: 39005 byte(s)
Diff to previous 20328
BUG: 0002094. Move 3DSlicer icons into appropriate subdirectories.

Revision 20328 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 6 20:14:26 2012 UTC (5 years, 4 months ago) by Michael.jeulinl
Original Path: trunk/CMakeLists.txt
File length: 39010 byte(s)
Diff to previous 20316
COMP: Remove main application/project name from configure options

These ones are now internal options that could be set within SlicerOverwriteDefaultOptions.cmake
without confusing the regular Slicer developer.

Revision 20316 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 3 19:52:13 2012 UTC (5 years, 4 months ago) by Michael.jeulinl
Original Path: trunk/CMakeLists.txt
File length: 39031 byte(s)
Diff to previous 20272
COMP: Main application name is now an advanced CMake option

Ensures that an icns icon file always exists when configuring slicer on MacOSX platform.

Revision 20272 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 28 21:52:09 2012 UTC (5 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38936 byte(s)
Diff to previous 20163
BUG: Fix extension bundling and simplify mechanism used to specify the main application

1) In Applications/SlicerApp/CMakeLists.txt:

  Improve comment explaining what should be considered when adding an other
application into Applications folder.

  Given the fact Slicer_APPLICATION_NAME is used locally, minimize confusion
by renaming variable renaming it into SlicerApp_APPLICATION_NAME.

  In case the application being configured is the *Main* application,
explicitly compare "PROJECT_NAME" with "Slicer_MAIN_PROJECT".


2) Rename variable Slicer_APPLICATION_NAME used to identified the main
application into Slicer_MAIN_PROJECT_APPLICATION_NAME. This will
minimize confusion and help maintaining the code.

3) Let's note that the mechanism used to fixup application should probably
be extended to account for other application build in the Applications folder.

4) In top-level CMakeLists, move code specific to main application description
into its own section.

5) Configure variable "Slicer_MAIN_PROJECT" and "Slicer_MAIN_PROJECT_APPLICATION_NAME"
into SlicerConfig so that "SlicerExtensionCPackBundleFixup" could successfully
refer to Slicer_MAIN_PROJECT_APPLICATION_NAME. This closes #2130

See http://www.na-mic.org/Bug/view.php?id=2130

Revision 20163 - (view) (download) (annotate) - [select for diffs]
Modified Sun May 27 16:26:51 2012 UTC (5 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38682 byte(s)
Diff to previous 20155
COMP: Configuring to use External Data.

Patch contributed by Jim Miller

Using mechanisms developed for ITKv4 to store test and baseline data
on a web resource (Midas or other website).

Data can be referenced using content based hashing scheme.

Still need to configure Extensions to use the Slicer object store.

Revision 20155 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 25 20:25:45 2012 UTC (5 years, 4 months ago) by Michael.jeulinl
Original Path: trunk/CMakeLists.txt
File length: 38113 byte(s)
Diff to previous 20088
ENH: Provide a mechanism to build several applications

Configure the applications and packaging with
two variables to configure the build:
- Slicer_MAIN_PROJECT # main project
- ${Slicer_MAIN_PROJECT}_APPLICATION_NAME # application name

Make the packaging given the main application name.

Revision 20088 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 16 17:13:17 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37918 byte(s)
Diff to previous 20069
COMP: SkullStripper being an extension, remove code to build it as built-in module.

Revision 20069 - (view) (download) (annotate) - [select for diffs]
Modified Sat May 12 02:30:22 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38256 byte(s)
Diff to previous 20063
ENH: Enforce the use of Qt 4.7.4. Fixes #2024

Note that developer can still specify a different version of Qt passing
 the CMake variable "Slicer_REQUIRED_QT_VERSION"

For example:

  $ cmake -DSlicer_REQUIRED_QT_VERSION:STRING=4.8.0 -DQT_QMAKE_EXECUTABLE:FILEPATH=/home/jchris/Projects/QtSDK-1.2/Desktop/Qt/4.8.0/gcc/bin/qmake ../Slicer4

Revision 20063 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 10 20:44:20 2012 UTC (5 years, 5 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 38258 byte(s)
Diff to previous 20038
COMP: build LibArchive even when extension manager is off

LibArchive is now used in mrml logic so it should not
be a conditional build.

Revision 20038 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 8 20:35:42 2012 UTC (5 years, 5 months ago) by Michael.jeulinl
Original Path: trunk/CMakeLists.txt
File length: 38340 byte(s)
Diff to previous 20028
COMP: Provide a mechanism to overwrite default build options

If a file named 'SlicerOverwriteDefaultOptions.cmake' is located within
the Slicer/CMake it will be included. It provides a mechanism to overwrite
default build options without modifying the main CMakeLists.txt.

Using such an approach will minimize rebase issues when building application
based on Slicer.

Revision 20028 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 4 21:58:15 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38170 byte(s)
Diff to previous 19992
BUG: Associate package name with the date of the last commit. Fixes #1974

See http://www.na-mic.org/Bug/view.php?id=1974

Revision 19992 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 3 21:48:48 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38260 byte(s)
Diff to previous 19971
STYLE: At configure time, display "Slicer_VERSION_FULL"

This is an additional feedback allowing to confirm that the appropriate
code base if used.

Revision 19971 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 1 00:11:14 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38193 byte(s)
Diff to previous 19962
COMP: Provide a mechanism to overwrite the auto-discovered Slicer_WC_REVISION

Such mechanism allows to overwrite the discovered Slicer_WC_REVISION
and build extensions against an expected revision associated with
a Slicer release.

While the core functionality (API/ABI) of slicer wouldn't be modified by a
newer Slicer revision, the extension build system could be improved or
fixed by a more recent set of patches. In that specific case, the option
Slicer_FORCED_WC_REVISION could be used.

Revision 19962 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 30 23:11:28 2012 UTC (5 years, 5 months ago) by benjamin.long
Original Path: trunk/CMakeLists.txt
File length: 37933 byte(s)
Diff to previous 19959
COMP: Package QtTesting

Conflicts:

	CMake/UseSlicer.cmake.in

Revision 19959 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 30 23:11:21 2012 UTC (5 years, 5 months ago) by benjamin.long
Original Path: trunk/CMakeLists.txt
File length: 37875 byte(s)
Diff to previous 19949
ENH: Add Qt Testing support

Expose signals/slots on some widget APIs for qttesting recording/replay

Revision 19949 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 26 22:51:27 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37475 byte(s)
Diff to previous 19948
COMP: Prevent confusion by consistently using platform as concatenation of "Os" and "architecture". See #1204

* Rename macro SlicerMacroGetPlatformArchitectureBitness and change its
associate return value from PLATFORM to OS.

Revision 19948 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 26 21:59:13 2012 UTC (5 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37459 byte(s)
Diff to previous 19932
BUG: Centralize revision/version information into version header file. Fixes 1204

* Remove SlicerVersion.txt that provide redundant information and
remove associated "discoverRepository" function.

* Note that slicer revision associated with extension manager can be overwritten
at runtime from within python using:

   slicer.app.extensionManagerModel().slicerRevision = "12345"

* See http://www.na-mic.org/Bug/view.php?id=1204

Revision 19932 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 23 23:11:04 2012 UTC (5 years, 5 months ago) by fedorov
Original Path: trunk/CMakeLists.txt
File length: 37739 byte(s)
Diff to previous 19894
ENH: enabling Python wrapping of QtSQL. This is a followup for an earlier discussion here:
http://slicer-devel.65872.n3.nabble.com/Cannot-include-ctkDICOMDatabase-h-td3788975.html


Revision 19894 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 14 23:09:17 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37735 byte(s)
Diff to previous 19887
BUG: Make sure 'slicer_setting_variable_message' works with long variable name

The helper macros used within "UseSlicer.cmake" have been factored out
into UseSlicerMacros.cmake to allow their testing.

Fix contributed by "Andreas Schuh"

Fixes #1901 - http://www.na-mic.org/Bug/view.php?id=1901

Revision 19887 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 12 06:06:29 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37700 byte(s)
Diff to previous 19886
ENH: Begin post-4.1.0 development

Revision 19886 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 12 06:00:42 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37699 byte(s)
Diff to previous 19849
ENH: Slicer 4.1.0

Revision 19849 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 11 10:56:27 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37699 byte(s)
Diff to previous 19844
COMP: Extension can reference Slicer_LAUNCH* variables even if BUILD_TESTING OFF

Slicer doesn't have to be build with Testing enabled to allow
extension to be build and tested.

Revision 19844 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 10 01:16:27 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37704 byte(s)
Diff to previous 19843
ENH: Begin post-4.1.0-rc3 development

Revision 19843 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 10 01:14:52 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37703 byte(s)
Diff to previous 19832
ENH: Slicer 4.1.0-rc3

Revision 19832 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 9 13:05:40 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37706 byte(s)
Diff to previous 19822
COMP: Prevent a warning level 4 by not using 'vtkDetermineCompilerFlags'

By forcing the warning level to 4, this VTK CMake block was not helping us.

In addition of setting flags for platform no supported by Slicer (AIX, HP-UX, ..)
, it is setting the /MP<X> [1] flags elegantly. This will probably be added
in a following commit.

[1] http://msdn.microsoft.com/en-us/library/bb385193(v=vs.90).aspx

Revision 19822 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 8 07:14:55 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37797 byte(s)
Diff to previous 19721
COMP: Move build option specific to SlicerQT into associated CMakeLists.txt

Revision 19721 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 27 23:14:59 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37933 byte(s)
Diff to previous 19713
COMP: Prevent confusion by moving code related to build system under CMake dir

Revision 19713 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 27 18:40:20 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37937 byte(s)
Diff to previous 19712
COMP: Easier maintenance of build system by renaming "SlicerCompleteBundles" into "SlicerCPackBundleFixup"

Revision 19712 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 27 18:40:18 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37936 byte(s)
Diff to previous 19698
COMP: Prevent confusion bymoving SlicerCompleteBundles.cmake.in in CMake dir.

* Also update SlicerCPack.cmake so that configured files are created within
<Slicer_BINARY_DIR>/CMake

Revision 19698 - (view) (download) (annotate) - [select for diffs]
Modified Sat Mar 24 23:47:59 2012 UTC (5 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37958 byte(s)
Diff to previous 19694
COMP: Comply with the documented minimum required version of Qt

See http://wiki.slicer.org/slicerWiki/index.php/Documentation/4.0/Developers/Build_Instructions/Prerequisites#Qt_library_requirements

Revision 19694 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 23 23:16:19 2012 UTC (5 years, 6 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37916 byte(s)
Diff to previous 19693
ENH: Begin post-4.1.0-rc2 development

Revision 19693 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 23 23:16:17 2012 UTC (5 years, 6 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37915 byte(s)
Diff to previous 19677
ENH: Slicer 4.1.0-rc2

Revision 19677 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 21 21:16:23 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37916 byte(s)
Diff to previous 19655
COMP: Minimize confusion by using the shared library wrapper provided by SlicerExecutionModel

Revision 19655 - (view) (download) (annotate) - [select for diffs]
Modified Mon Mar 19 07:02:07 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38267 byte(s)
Diff to previous 19651
COMP: Avoid confusion by defining SIMPLE_TEST macro only once.

* Consistently set the variable KIT within the Testing/Cxx/CMakeLists.txt of
each library.

* Fix name inconsistency. See #1615

Revision 19651 - (view) (download) (annotate) - [select for diffs]
Modified Mon Mar 19 04:21:55 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38234 byte(s)
Diff to previous 19644
COMP: Qt Script library is required when ExtensionManager support is enabled

Revision 19644 - (view) (download) (annotate) - [select for diffs]
Modified Mon Mar 19 04:21:39 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38135 byte(s)
Diff to previous 19615
ENH: Extension package are now properly "fixed up" on MacOX

* Disable CMAKE_INSTALL_NAME_TOOL when packaging extension, that way all
installed library will contain the full path to their direct dependencies provided
by the extension itself. Doing so will allow the to properly fix all libraries.

* Copy SlicerCompleteBundle.cmake.in into SlicerExtensionCompleteBundle.cmake.in,
also copy function "get_bundle_keys" and "fixup_bundle" from BundleUtilities.cmake
and respectively rename them into "get_extension_keys" and "fixup_extension".
This has been motivated by the fact there is no executable available within the
"Slicer.app/Contents/MacOS" directory. It means we have to "fake" it by
commenting the function which was explicitly checking for the existence
of an executable. For instance, "get_bundle_and_executable" has been commented out.
The variable "exepath" is now explicitly set within the function "fixup_extension"
and "get_extension_keys"

* To speed up the "fixup" process, "get_prerequisites" is called with
"recurse" parameter set to "0".

* Note also that since all the libraries available under the Slicer superbuild
directory have already been fixed up, the "fixup_extension" function
check if a given item is located within a sub directory of "Slicer_SUPERBUILD_DIR".
If it's the case, the item will be skipped.

* The install directory being different within the bundle, the CMake block
"SlicerBlockUploadExtensionPrerequisites" has been updated to "patch"
the *MODULES_*_DIR" variable with "Slicer_BUNDLE_EXTENSIONS_LOCATION".

Revision 19615 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 15 15:38:26 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38088 byte(s)
Diff to previous 19610
COMP: Fixup extension expects the libarchive library to contain the full path.

Revision 19610 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 14 18:45:54 2012 UTC (5 years, 7 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37678 byte(s)
Diff to previous 19609
ENH: Begin post-4.1.0-rc1 development

Revision 19609 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 14 18:45:53 2012 UTC (5 years, 7 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37677 byte(s)
Diff to previous 19559
ENH: Slicer 4.1.0-rc1

Revision 19559 - (view) (download) (annotate) - [select for diffs]
Modified Sat Mar 10 06:25:12 2012 UTC (5 years, 7 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37547 byte(s)
Diff to previous 19553
COMP: BSplineToDeformationField, CLIs and Brainstools must be ON for EMSegment to work

By depending on Slicer_BUILD_BRAINSTOOLS, it indirectly depends on Slicer_BUILD_CLI and Slicer_BUILD_CLI_SUPPORT.

Revision 19553 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 9 19:08:38 2012 UTC (5 years, 7 months ago) by tokuda
Original Path: trunk/CMakeLists.txt
File length: 37547 byte(s)
Diff to previous 19402
ENH: Change Slicer_BUILD_OpenIGTLink and Slicer_BIULD_OpenIGTLinkIF options to ON in default.

Revision 19402 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 26 20:35:15 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37549 byte(s)
Diff to previous 19401
COMP: Simplify how external project options and list of dependencies are specified

* Since the cmake macro CMAKE_DEPENDENT_OPTION is used to "link" build option
together, the logic allowing to determine if any CMake code that
should be executed according to these option can be simplified.

Before:

if(Slicer_Build_Foo)
  message("Oohoh")
  if(Slicer_Build_Bar)
    message("yeahh")
  endif()
endif()


After:

if(Slicer_Build_Foo)
  message("Oohoh")
endif()

if(Slicer_Build_Bar)
  message("yeahh")
endif()


This is possible because option B is specified using the following:

CMAKE_DEPENDENT_OPTION(
  Slicer_Build_Bar "Build Bar." OFF
  "Slicer_Build_Foo" OFF)

See http://www.cmake.org/cmake/help/cmake-2-8-docs.html#module:CMakeDependentOption

Revision 19401 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 26 20:35:13 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37647 byte(s)
Diff to previous 19340
COMP: Integrate SlicerWebGLEXport as an external project

* By keeping the source code of this project in its own github repository,
it makes review of the code, contribution, integration and
development of the code an easier process.

Revision 19340 - (view) (download) (annotate) - [select for diffs]
Modified Wed Feb 22 20:22:56 2012 UTC (5 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37470 byte(s)
Diff to previous 19329
BUG: Fix integration of MultiVolumeExplorer and MultiVolumeImporter

* Option Slicer_MULTIVOLUME_SUPPORT renamed into Slicer_BUILD_MULTIVOLUME_SUPPORT
and set as advanced

* Introduced option Slicer_BUILD_MultiVolumeImporter and Slicer_BUILD_MultiVolumeExplorer
depending on Slicer_BUILD_MULTIVOLUME_SUPPORT. These options are also advanced.

* Updated the CMakeLists.txt in both Scripted and Loadable folder so
that the source corresponding to these two modules is considered.

Revision 19329 - (view) (download) (annotate) - [select for diffs]
Modified Wed Feb 22 16:16:50 2012 UTC (5 years, 7 months ago) by fedorov
Original Path: trunk/CMakeLists.txt
File length: 36975 byte(s)
Diff to previous 19255
ENH: adding external projects for multivolume support


Revision 19255 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 7 23:44:26 2012 UTC (5 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36907 byte(s)
Diff to previous 19225
COMP: Requires at least Qt 4.6.3 on Linux/Windows, and 4.7.0 on MacOSX

* The build system now reflect what's advertised on the wiki.

Revision 19225 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 6 21:04:28 2012 UTC (5 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36847 byte(s)
Diff to previous 19222
ENH: Extensions are now downloaded from Midas instead of CDash

* Use qMidasAPI library instead of qCDashAPI

* Configuring an extension description file using package name is not required
anymore. Metadata associated with a package will be directly sent to MIDAS
using the web API.

Revision 19222 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 6 21:04:22 2012 UTC (5 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36847 byte(s)
Diff to previous 19034
ENH: Update and improve extension build system

* Use recently added function SlicerFunctionMIDASUploadExtension

* Add a CMakeLists to Slicer/Extensions/CMake allowing to build the extensions
as a standalone project independently of Slicer.

For example:
 mkdir SlicerExtentions-build
 cd SlicerExtentions-build
 cmake -DSlicer_UPLOAD_EXTENSIONS:BOOL=ON -DSlicer_DIR:PATH=/home/jchris/Projects/Slicer4-Superbuild-Debug/Slicer-build/ ../Slicer4/Extensions/CMake/
 make

* Mote that it's still possible to build Slicer with the options Slicer_BUILD_EXTENSIONS
and Slicer_UPLOAD_EXTENSIONS

What's next?
 * Integrate qMidasAPI library instead of qCDashAPI and update extension manager
 * On macosx, update extension packaging (or installation) to properly
fix up extension libraries.

Revision 19034 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 7 00:18:20 2012 UTC (5 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37055 byte(s)
Diff to previous 19033
ENH: Begin post-4.0.1 development

Revision 19033 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 7 00:18:19 2012 UTC (5 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37054 byte(s)
Diff to previous 19032
ENH: Slicer 4.0.1

Revision 19032 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 7 00:18:18 2012 UTC (5 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 37055 byte(s)
Diff to previous 19018
COMP: Setup release versioning

Slicer_VERSION_FULL will be:
...
4.0.0.2012-01-05
4.0.0.2012-01-06
4.0.1
4.0.1.2012-01-06
4.0.1.2012-01-07
...

Revision 19018 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 5 01:58:57 2012 UTC (5 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 36787 byte(s)
Diff to previous 18963
COMP: Install the Qt plugins in the same location lib/QtPlugins

qt.conf doesn't support more than 1 plugin path so the plugins must be
in a unique location ?

Revision 18963 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 20 19:35:41 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36778 byte(s)
Diff to previous 18962
ENH: Configure SlicerConfigVersion.cmake so that find_package(Slicer X.Y.Z) works

See http://www.cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file

Revision 18962 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 20 19:35:36 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36727 byte(s)
Diff to previous 18957
COMP: Rename variable Slicer_*_VERSION into Slicer_VERSION_* to be consistent with CMake convention.

See http://www.cmake.org/cmake/help/cmake-2-8-docs.html#command:find_package

Revision 18957 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 20 01:11:05 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36727 byte(s)
Diff to previous 18943
COMP: Install and require Qt SVG library. Fixes #1621

* Since the libqvg imageformat plugin was provided by the installer whereas
 the libQtSVG associated library wasn't, on a system where a set of
Qt libraries was already installed, if the version of provided libraries
and the one already installed were different, the plugin dependency were
resolving to the incorrect one.

Revision 18943 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 15 20:17:43 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36723 byte(s)
Diff to previous 18941
COMP: Remove unused script Pre283CMakeParseArguments.cmake

* Since the minimum required version of CMake is now 2.8.4, this script
isn't needed anymore.

Revision 18941 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 15 20:10:14 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36809 byte(s)
Diff to previous 18931
COMP: Change minimum required version of CMake 2.8.4

* This is now consistent to the documented requirement.
See http://wiki.slicer.org/slicerWiki/index.php?title=Documentation/4.0/Developers/Build_Instructions&oldid=22880

Revision 18931 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 15 07:45:25 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36868 byte(s)
Diff to previous 18929
ENH: Add Slicer_BUILD_EXTENSIONMANAGER_SUPPORT option

* If disabled:
 - extension manager won't be integrated
 - external project qCDashAPI and LibArchive won't be checkedout

Revision 18929 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 15 07:45:18 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36660 byte(s)
Diff to previous 18928
COMP: Add Slicer_BUILD_CLI_SUPPORT

* When disabled, neither the CLI factories or the CLI modules will be built.

Revision 18928 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 15 03:14:46 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36219 byte(s)
Diff to previous 18881
COMP: Disable SkullStripper if ITK < 4

Revision 18881 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 8 09:34:04 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36065 byte(s)
Diff to previous 18880
COMP: Add Slicer_BUILD_OpenIGTLinkIF option allowing to build the corresponding module

* The source of the module are checked out using an external project

* The source are then added conditionally similarly to a regular source directory

Revision 18880 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 8 09:34:01 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 35866 byte(s)
Diff to previous 18873
COMP: OpenIGTLink external project is disabled by default

Revision 18873 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 7 12:28:44 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 35865 byte(s)
Diff to previous 18866
COMP: Set MRMLWidgets_WRAP_PYTHON to ON

Revision 18866 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 6 20:53:14 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 35866 byte(s)
Diff to previous 18864
COMP: Move all MRML libraries into Libs/MRML sub-directory

* Also rename MRML library into MRMLCore library

Revision 18864 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 6 20:49:19 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 35866 byte(s)
Diff to previous 18853
COMP: Source code of all modules is now located in Modules sub-directory

Revision 18853 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 6 01:57:30 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36257 byte(s)
Diff to previous 18821
COMP: CMakeLists.txt - Remove code used to build Slicer3 module logic

Revision 18821 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 6 00:09:46 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37257 byte(s)
Diff to previous 18820
COMP: Move vtkSlicer(Version)Configure.h.in into CMake sub-directory

* Also fix a problem related to configuration of script now located in
Utilites/Scripts sub-directory.

Revision 18820 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 6 00:09:44 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37043 byte(s)
Diff to previous 18819
COMP: Move TestingMacros.h into CMake sub-directory

Revision 18819 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 6 00:09:42 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37007 byte(s)
Diff to previous 18809
COMP: Move qSlicerExport.h.in into CMake sub-directory

Revision 18809 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 5 23:18:57 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37001 byte(s)
Diff to previous 18798
COMP: Move SlicerVersion.txt.in into CMake sub-directory

Revision 18798 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 2 13:41:06 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36995 byte(s)
Diff to previous 18797
COMP: Slicer_BUILD_LEGACY_CLI depends on Slicer_BUILD_CLI option

Revision 18797 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 2 13:30:44 2011 UTC (5 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36954 byte(s)
Diff to previous 18778
COMP: Add advanced option to disable/enable the building of ChangeTrackerPy, EMSegment and SkullStripper

Revision 18778 - (view) (download) (annotate) - [select for diffs]
Modified Sun Nov 27 05:45:41 2011 UTC (5 years, 10 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 36561 byte(s)
Diff to previous 18689
ENH: Slicer 4.0.0 is made, now work on 4.0.1

Revision 18689 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 15 16:43:01 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36565 byte(s)
Diff to previous 18677
ENH: Add "no-win32-console" support to AppLauncher

Revision 18677 - (view) (download) (annotate) - [select for diffs]
Modified Fri Nov 11 23:27:29 2011 UTC (5 years, 11 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 36566 byte(s)
Diff to previous 18648
ENH: Add option to build Slicer with no console on Windows

Add Slicer_BUILD_WIN32_CONSOLE at superbuild and build level

Revision 18648 - (view) (download) (annotate) - [select for diffs]
Modified Wed Nov 9 18:38:44 2011 UTC (5 years, 11 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 36429 byte(s)
Diff to previous 18632
BUG: Enable legacy modules by default as EMSegment requires BSplineToDeformationField

There are most probably other dependencies, so we enable all of them, just in case.
Issue #1506

Revision 18632 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 8 18:55:12 2011 UTC (5 years, 11 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 36430 byte(s)
Diff to previous 18625
COMP: ResampleVolume2 requires DiffusionApplications to be configured first

ResampleVolume2 requires DiffusionFilter_SOURCE_DIR to be set before
 the project is configured.
DiffusionFilter_SOURCE_DIR is initialized in DiffusionApplications.
Remove DiffusionApplications from the LEGACY.

Revision 18625 - (view) (download) (annotate) - [select for diffs]
Modified Mon Nov 7 20:18:36 2011 UTC (5 years, 11 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 36429 byte(s)
Diff to previous 18619
BUG: Restore legacy CLI plugins

ResampleVolume2 depends on them (mainly ResampleDTI)

Revision 18619 - (view) (download) (annotate) - [select for diffs]
Modified Sat Nov 5 22:41:47 2011 UTC (5 years, 11 months ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 36430 byte(s)
Diff to previous 18581
STYLE: Addressing module menu ordering request

Hans,

I would like to reorganize the module listings for registration. I am
proposing to highlight brainsfit and resample image and tuck everything
else under a listing called specialized. I did this reorganization on
the wiki pages already. If you concur, please do.

While you are at it, would you mind also moving Legacy and Utilities to
the bottom of the module listing in Slicer. I did it already on the
wiki.

Thanks
Ron

Revision 18581 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 3 20:26:30 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36354 byte(s)
Diff to previous 18521
COMP: Use Slicer_CLIMODULES_SUBDIR instead of hardcoded value

* See also http://viewvc.slicer.org/viewvc.cgi/Slicer3?view=revision&revision=16902

Revision 18521 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 28 04:13:58 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36342 byte(s)
Diff to previous 18516
COMP: Force value of ITK_VERSION_MAJOR to 3 if invalid

Revision 18516 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 28 01:41:49 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36206 byte(s)
Diff to previous 18515
COMP: Fix typo - ITK_VERSION_MAJOR instead of CMAKE_BUILD_TYPE

Revision 18515 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 28 01:29:10 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 36205 byte(s)
Diff to previous 18495
COMP: Remove option Slicer_BUILD_WITH_ITKv4 and add ITK_VERSION_MAJOR

Revision 18495 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 27 16:57:58 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34880 byte(s)
Diff to previous 18452
COMP: CTest module need to be included at Superbuild level for CTEST_USE_LAUNCHER to works

See http://www.kitware.com/blog/home/post/11

Revision 18452 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 25 07:49:13 2011 UTC (5 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34569 byte(s)
Diff to previous 18446
COMP: Move options Slicer_*_GIT_{REPOSITORY, TAG} into their respective external project definition

* Use a specific SHA1 for ITKv3 external project git tag

Revision 18446 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 24 22:59:03 2011 UTC (5 years, 11 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 35241 byte(s)
Diff to previous 18354
ENH: Enable Slicer brainstools by default

Revision 18354 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 18 04:06:39 2011 UTC (6 years ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 35242 byte(s)
Diff to previous 18353
COMP: Fix compilation error in VTK on Windows

Revision 18353 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 17 23:31:54 2011 UTC (6 years ago) by Michael.jeulinl
Original Path: trunk/CMakeLists.txt
File length: 35242 byte(s)
Diff to previous 18344
ENH: ImplicitPlaneWidget2 Implementation LockNormalToCamera

Delete TCL module and use the widget throught a MRMLDisplayableManager:
vtkMRMLThreeDReformatDisplayableManager.

Revision 18344 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 17 17:34:07 2011 UTC (6 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 35242 byte(s)
Diff to previous 18338
COMP: Introduce Slicer_SKIP_ROOT_DIR_MAX_LENGTH_CHECK advanced option and reduce length to 38 chars

* Since ITKv4 limits its root directory size to 50, we accounted for the
length of "ITKv4-build" and change it to be 38.

Revision 18338 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 17 00:16:54 2011 UTC (6 years ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 34865 byte(s)
Diff to previous 18327
ENH: Fire interaction events when dragging transfer function control points


Revision 18327 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 13 05:38:03 2011 UTC (6 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34865 byte(s)
Diff to previous 18326
STYLE: Fix typo - Use ${PROJECT_NAME} instead of "ITK". Refs #1480

Revision 18326 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 12 23:11:46 2011 UTC (6 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34817 byte(s)
Diff to previous 18325
COMP: On windows, root of both source and binary directory shouldn't be too deep. Fixes #1480

Revision 18325 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 12 22:56:34 2011 UTC (6 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34303 byte(s)
Diff to previous 18311
COMP: Mac - Install CLI executabled in a dedicated folder.

* This change has been motivated by the fact no all executables within bin folder
are CLI executables and some of them are not exiting gracefull and they are
causing Slicer to crash when invoked within the "--xml" option.

* The CLI executables are now installed "cli-executables" folder

Revision 18311 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 12 00:34:58 2011 UTC (6 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34290 byte(s)
Diff to previous 18290
COMP: On mac, install CLI executables in "Slicer_BIN_DIR"

* This is a temporary solution to allow CLI executable to run as expected.

* A more elegant solution would be to create a "Slicer.framework" on which both "Slicer.app"
and the plugins/extensions (or loadable bundles) would depend on.

Revision 18290 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 7 03:12:13 2011 UTC (6 years ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33556 byte(s)
Diff to previous 18235
ENH: Moving transfer function points outside of current bounds is now valid

+ better performance when moving all points (no refresh).
StartEvent and EndEvent is invoked on transfer functions when moving points.

Revision 18235 - (view) (download) (annotate) - [select for diffs]
Modified Fri Sep 30 06:17:35 2011 UTC (6 years ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33556 byte(s)
Diff to previous 18174
COMP: Fix windows commit for ctkCorePythonQtDecorator

The pythonqt fix in CTK is after a CTK/VTK chart feature, so we need to update the VTK tag as well.

Revision 18174 - (view) (download) (annotate) - [select for diffs]
Modified Sat Sep 24 05:23:05 2011 UTC (6 years ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33556 byte(s)
Diff to previous 18145
ENH: Update VTK tag to bring new features from the Charts

Mainly the key event support.

Revision 18145 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 21 19:48:57 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33556 byte(s)
Diff to previous 18142
COMP: CMakeLists - Add Slicer_{CLI, QTLOADABLE, QTSCRIPTED}MODULES_SUBDIR variables

* These variables, also exposed to C++ through vtkSlicerConfigure, will
allow to reference path specific to other modules in an abstract way by
avoiding to use hardcoded value.

* Note that more work is required so that these values can be
exposed to Python.

Revision 18142 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 21 19:48:51 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32945 byte(s)
Diff to previous 18141
COMP: {cli, qt-scripted, qt-loadable}-modules built/installed under "share/Slicer-X.Y" directory

* ColorFiles and ParameterSets are directly available under "share/Slicer-X.Y"

* qSlicerCoreApplication set environment variable SLICER_SHARE_DIR to
have the value of "Sliscer_SHARE_DIR"

* Python and TCL scripts references resources using SLICER_SHARE_DIR environment variable

Revision 18141 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 21 19:48:45 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32819 byte(s)
Diff to previous 18140
COMP: Rename CLI directory from "plugins" to "cli-modules"

Revision 18140 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 21 19:48:44 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32807 byte(s)
Diff to previous 18139
COMP: SlicerVersion.txt configured/installed into "share/Slicer-X.Y" directory

Revision 18139 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 21 19:48:42 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32797 byte(s)
Diff to previous 18138
COMP: Add version to include, share and lib Slicer subdirectory

* It means the folder will now  be:

  lib/Slicer-X.Y
  include/Slicer-X.Y
  share/Slicer-X.Y

where X and Y will be major and minor Slicer version number.

Revision 18138 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 21 19:48:40 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32654 byte(s)
Diff to previous 18046
COMP: Do not configure/install the Tcl based launcher

Revision 18046 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 14 07:52:12 2011 UTC (6 years, 1 month ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33624 byte(s)
Diff to previous 18045
BUG: Fix slice view lightbox border of 1px

Revision 18045 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 14 07:50:06 2011 UTC (6 years, 1 month ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33624 byte(s)
Diff to previous 17998
ENH: Add borders around transfer function charts

Borders are not yet on by default.
Issue #1288

Revision 17998 - (view) (download) (annotate) - [select for diffs]
Modified Thu Sep 8 15:16:11 2011 UTC (6 years, 1 month ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33624 byte(s)
Diff to previous 17976
BUG: Fix wrong UPDATE_EXTENT vtkImageResliceMask when having a polydata mapper in the pipeline

This is a temporary fix until SlicerVTK:combined-extent-reset is pushed back to VTK.
Closes #1394

Revision 17976 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 6 06:52:26 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33624 byte(s)
Diff to previous 17968
COMP: Option Slicer_BUILD_{CLI, LOADABLEMODULES, SCRIPTEDMODULES} shouldn't disable the functionality itself

* Enabling/Disabling these options will/will not build the modules existing
in the Slicer source tree but the code allowing to load such module will
be compiled.

Revision 17968 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 5 22:10:44 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33698 byte(s)
Diff to previous 17864
STYLE: CMakeLists.txt - Fix indent

Revision 17864 - (view) (download) (annotate) - [select for diffs]
Modified Sat Aug 27 05:10:34 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33594 byte(s)
Diff to previous 17858
COMP: Waiting build issue are resolved - BRAINS tools is now disabled by default

Revision 17858 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:51 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33593 byte(s)
Diff to previous 17857
COMP: Remove CMake variables Slicer{_INSTALL}_PLUGINS_INCLUDE_DIR

* The way CLI header files are exposed will be revisited when we will be working
on Slicer devel package.

Revision 17857 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:48 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33751 byte(s)
Diff to previous 17856
COMP: Rename Slicer_INSTALL_PLUGINS_LIB_DIR CMake variable into Slicer_INSTALL_CLIMODULES_LIB_DIR

Revision 17856 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:44 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33748 byte(s)
Diff to previous 17855
COMP: Rename Slicer_INSTALL_PLUGINS_BIN_DIR CMake variable into Slicer_INSTALL_CLIMODULES_BIN_DIR

Revision 17855 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:37 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33745 byte(s)
Diff to previous 17854
COMP: Rename CMake variables Slicer_(INSTALL_)PLUGINS_SHARE_DIR into Slicer_(INSTALL_)CLIMODULES_SHARE_DIR

Revision 17854 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:33 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33736 byte(s)
Diff to previous 17853
COMP: Rename Slicer_PLUGINS_LIB_DIR CMake variable into Slicer_CLIMODULES_LIB_DIR

Revision 17853 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:29 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33730 byte(s)
Diff to previous 17852
COMP: Rename Slicer_PLUGINS_BIN_DIR CMake variable into Slicer_CLIMODULES_BIN_DIR

Revision 17852 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 26 21:26:25 2011 UTC (6 years, 1 month ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33724 byte(s)
Diff to previous 17797
COMP: Define Slicer_PLUGINS_ and Slicer_INSTALL_PLUGINS_ variable before including SuperBuild.cmake

* Doing so will allow external project to rely on the value of these variables

Revision 17797 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 23 01:38:39 2011 UTC (6 years, 2 months ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 33753 byte(s)
Diff to previous 17786
ENH: Turn on building BRAINSTools by default.

Revision 17786 - (view) (download) (annotate) - [select for diffs]
Modified Mon Aug 22 01:26:00 2011 UTC (6 years, 2 months ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 33754 byte(s)
Diff to previous 17782
COMP: Set BRAINSTools building for ITKv3 and ITKv4

BRAINSTools is built quite differently for ITKv3 and
ITKv4.  This separates they way they are configured.

Added BRAINSTools as an External_Project for ITKv4,
and left it as an internal build for ITKv3.

Revision 17782 - (view) (download) (annotate) - [select for diffs]
Modified Mon Aug 22 01:25:21 2011 UTC (6 years, 2 months ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 33562 byte(s)
Diff to previous 17610
COMP: Prefer system CMakeParseArguments when >=2.8.3

Revision 17610 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 29 16:14:58 2011 UTC (6 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33476 byte(s)
Diff to previous 17429
ENH: Introduce Slicer_QTLOADABLEMODULES_PYTHON_LIB_DIR variable

* This variable points to the location of python scrips associated
with a Qt loadable module.

Revision 17429 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jul 10 03:49:24 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33076 byte(s)
Diff to previous 17405
ENH: Add "UITOOLS" to the list of required Qt modules

Revision 17405 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jul 9 04:31:43 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33068 byte(s)
Diff to previous 17395
ENH: INCR_TCL_VERSION and TCL_TK_VERSION are passed to Slicer through superbuild

Revision 17395 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 8 19:15:22 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33824 byte(s)
Diff to previous 17362
COMP: No extra "/" is required when using Slicer_INSTALL_ROOT

Revision 17362 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 6 23:56:13 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33840 byte(s)
Diff to previous 17361
ENH: Prevent in build installs

* Adapated from ITKv4/CMake/PreventInBuildInstalls.cmake

Revision 17361 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 6 23:56:11 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33808 byte(s)
Diff to previous 17357
ENH: Prevent in source build

* Adapated from ITKv4/CMake/PreventInSourceBuilds.cmake

Revision 17357 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 6 23:04:44 2011 UTC (6 years, 3 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33601 byte(s)
Diff to previous 17347
BUG: Fix transfer function bugs

  * transfer_function_editors:
      Don't synchronize the axes in real time
      Unnecessary boundsChanged signals
      ctkVTKChartView was not supporting user bounds correctly
      Forgot to remove ColorPointsFunction

Revision 17347 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 6 20:42:40 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33601 byte(s)
Diff to previous 17346
ENH: Move CLI module sources and tests to a dedicated folder

* This is a first step toward the modularization of Slicer

* The different steps are described below:

# Make cli module directory
cd Applications/CLI
ls -1 *.xml | cut -d'.' -f1 | xargs mkdir

# Open each future CMakeLists.txt using gedit
for i in `ls -1 *.xml | cut -d'.' -f1`; do `gedit $i/CMakeLists.txt&` ; done

# Manual operation: Copy CMake code from Applications/CLI/CMakeLists.txt to each CMakeLists.txt

# Make cli Tesing module directory
for i in `ls -1 *.xml | cut -d'.' -f1`; do mkdir $i/Testing ; done

# Open each future Testing/CMakeLists.txt using gedit
for i in `ls -1 *.xml | cut -d'.' -f1`; do `gedit $i/Testing/CMakeLists.txt&` ; done

# Manual operation: Copy CMake code from Applications/CLI/CMakeLists.txt to each CMakeLists.txt

# Get the list of modules that should be add in Applications/CLI/CMakeLists.txt using add_subdirectory()
ls -1 *.xml | cut -d'.' -f1

# Move *.{xml, cxx} files into their respective directory
for i in `ls -1 *.xml | cut -d'.' -f1`; do mv $i.{xml,cxx} $i; done

ENH: Add Slicer_BaseCLI_INCLUDE_DIRS to SlicerConfig

* Note that ideally the file provided by SlicerBaseCLI should be added
to SlicerExecutationModel.

COMP: Remove find_package and include_dir from CLI/CMakeLists.txt

* Each module should include its required dependencies

Revision 17346 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 6 01:51:17 2011 UTC (6 years, 3 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33602 byte(s)
Diff to previous 17343
COMP: Fix libarchive compilation on Windows

Revision 17343 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 5 23:20:42 2011 UTC (6 years, 3 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33485 byte(s)
Diff to previous 17341
ENH: Improve transfer function editors.

Synchronize the ranges in ctkVTKVolumePropertyWidget
Add color to the opacity control points
Synchronize Opacity and Colors range
Support custom range in ctkVTKThresholdWidget
Support custom bounds in ctkVTKChartViews
Add ctkVTKThresholdWidget


Revision 17341 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 5 22:54:24 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33452 byte(s)
Diff to previous 17294
ENH: A different LibArchive external project can now be specified

* This can be achieved configuring Slicer passing LibArchive_DIR

* LibArchive_DIR should points to an installed tree of LibArchive

Revision 17294 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 1 20:55:09 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33110 byte(s)
Diff to previous 17287
ENH: Update VTK tag

* Both variables Slicer_VTK_GIT_TAG and Slicer_VTK_GIT_REPOSITORY are forced
into the cache so that existing build of slicer are updated properly.

* Known issue: Forcing the value will prevent used from customizing the value.
A different mechanism will have to be setup so that developer can customize
their build.

Revision 17287 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 1 04:15:51 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33011 byte(s)
Diff to previous 17284
ENH: SlicerExecutionModel is now an external project

* A single find_package(SlicerExecutionModule) can be used.

* Calling find_package(SlicerExecutionModule ...) will systematically define the
ModuleDescriptionParser_DIR, GenerateCLP_DIR and TCLAP_DIR

* Assuming ModuleDescriptionParser_DIR, GenerateCLP_DIR or TCLAP_DIR are defined,
the corresponding find_package() call are still valid.

* Call of the form find_package(SlicerExecutionModule REQUIRED GenerateCLP) or
find_package(SlicerExecutionModule REQUIRED ModuleDescriptionParser) are valid and
will:
  - include the target of the specified components
  - set SlicerExecutionModel_INCLUDE_DIRS, SlicerExecutionModel_LIBRARIES appropriately.

* Known issue: SlicerExecutionModel_LIBRARY_DIRS is not defined. Since the
list of library SlicerExecutionModel_LIBRARIES is defined and the associated
CMake target imported. If CMake 2.6 or above is used, this shouldn't be a problem.

Revision 17284 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 30 21:18:58 2011 UTC (6 years, 3 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 33263 byte(s)
Diff to previous 17262
COMP: Use macro to generate Export.h files

Get one step closer to using ctkMacroBuildPlugin.

Revision 17262 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 28 07:48:38 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32908 byte(s)
Diff to previous 17261
ENH: Updated slicerMacroBuildCLI to be used within extension.

 * Slicer_CLI_SHARED_LIBRARY_WRAPPER_CXX has been added to SlicerConfig. It
points to SharedLibraryWrapper cxx file.

Revision 17261 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 28 05:34:41 2011 UTC (6 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32784 byte(s)
Diff to previous 17205
ENH: Option Slicer_BUILD_QTSCRIPTEDMODULES will be available only if Slicer_USE_PYTHONQT is enabled.

Revision 17205 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 23 18:40:15 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32737 byte(s)
Diff to previous 17193
COMP: Make sure CMAKE_OSX_* variables are set before project() or enable_language() calls.

* By setting CMAKE_OSX_* variables before any enable_language() or project() calls,
we ensure that the bitness will be properly detected.

Revision 17193 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 23 03:28:28 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32487 byte(s)
Diff to previous 17192
COMP: OpenIGTLink can now be properly referenced within Extension

* Note also that Slicer_USE_OPENIGTLINK has been changed into Slicer_USE_OpenIGTLink

Revision 17192 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 23 01:49:45 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32487 byte(s)
Diff to previous 17191
STYLE: Credit for the previous commit (r17191) are for Hans Johnson

Revision 17191 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 23 01:39:37 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32488 byte(s)
Diff to previous 17160
STYLE: Move CMake commands to match new conventions

The next step in removing end-of-lines is to run through all the
CMakeLists.txt files and clean them up.

This also changes all the key words to lower
case. The primary reason for changing key words is that all documentation for
CMakeLists.txt now shows the key words as lower case. Even the printed
“Mastering CMake v5” uses lower case. I’ve come across this several
times in my class where students stumble over the fact that the
documentation about Cmake does not match the implementation in ITK.

I have a script (a wrapper around a vim macro) written that can make
these substituions reliably (Tested on the BRAINS tree, the Slicer3
tree, and the ITK tree without causing any errors).  More complete
documentation can be found in
ITK/Utilities/Maintenance/HowToCreateTheCMakeCaseConversion.txt

Revision 17160 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 21 13:19:37 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32510 byte(s)
Diff to previous 17146
ENH: Expose ctkMacroCompilePythonScript to extension + add SlicerMacroConfigureGenericPythonModuleTests

* Similarly to its Cpp equivalent, that convenient macro allow to
configure a python unittest allowing to test the module.

Revision 17146 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 20 00:25:40 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32454 byte(s)
Diff to previous 17145
BUG: Build the logic located in Modules (sub-)directory only if needed

* Building with Slicer_BUILD_QTLOADABLEMODULES:OFF was causing problem. Indeed
The logic are using the macro SlicerMacroBuildModuleVTKLibrary which was
expecting the variable Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR to
be defined.

Revision 17145 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 20 00:25:39 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32380 byte(s)
Diff to previous 17121
COMP: Rename SlicerMacroAddGenericCxxModuleTests into SlicerMacroConfigureGenericCxxModuleTests

Revision 17121 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 18 23:46:40 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32374 byte(s)
Diff to previous 17104
ENH: Add SlicerMacroAddGenericCxxModuleTests  + add/update module tests

* This macro allows to easily associate systematic test with a module

* The file qSlicerModuleTest1.cxx.in is configured and compiled with each test suite

* Existing module have been updated

* Testing has been added to "untested" modules

* Code within TractograpghyDisplay/CMakeLists.txt has been re-organized

Revision 17104 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 18 05:29:03 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32327 byte(s)
Diff to previous 17103
COMP: Rename SlicerMacroDiscoverSystemNameAndBits into SlicerMacroGetPlatformArchitectureBitness

It's good practice to name macros after what they do.

Revision 17103 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 18 05:29:01 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32310 byte(s)
Diff to previous 17102
ENH: Use Slicer_ARCHITECTURE, Slicer_PLATFORM, Slicer_BITNESS instead of Slicer_BUILD and Slicer_BUILD_BITS

Revision 17102 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 18 05:28:58 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32297 byte(s)
Diff to previous 17101
ENH: Change Slicer_VERSION_* into Slicer_*_VERSION

Major, minor and patch qualify the version not the other way.

Revision 17101 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 18 05:28:56 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32297 byte(s)
Diff to previous 17078
ENH: Add revision, builddate, ... into to vtkSlicerVersionConfigure.h.in

Revision 17078 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:26:23 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32300 byte(s)
Diff to previous 17075
ENH: Add option Slicer_UPLOAD_EXTENSIONS AND Update extension build system

If WITH_EXTENSION is OFF, slicer superbuild behaves as usual
otherwise, option Slicer_UPLOAD_EXTENSIONS is added:

* Slicer_UPLOAD_EXTENSIONS is OFF

  It means the extensions are added to superbuild as regular "external"  project
  depending on Slicer. The different "external" project are  named after
  the <extension_name>.

  For convenience, an "external project" named <extension_name>-rebuild is added.
  This project doesn't depend on Slicer and can be used to rebuild only
  the extension without waiting for Slicer and its dependencies(VTK, CTK, ...)
  to be configured, built ..


* Slicer_UPLOAD_EXTENSIONS is ON

  It means the extensions are added to superbuild as "ctest-fied" project.
  In other word, the BUILD_COMMAND of the external project is set to
  execute a ctest script that will configure, build, test, package and upload
  the packages to CDash.

  The configure/build/test results and also the packages are submitted to either
  Extensions-Nightly, Extensions-Continuous or Extensions-Experimental track.

  Similarly to the previous case, external project named <extension_name>-rebuild
  are also added.

When setting up dashboard, Slicer_UPLOAD_EXTENSIONS should be set to TRUE.
Within the Slicer dashboard driver script, both Slicer_BUILD_EXTENSIONS
and Slicer_UPLOAD_EXTENSIONS are set if WITH_EXTENSIONS is TRUE.

Revision 17075 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:26:18 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32164 byte(s)
Diff to previous 17073
ENH: CMakeLists.txt - Do not add CTest default targets beside of Experimental target

Revision 17073 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:26:14 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31740 byte(s)
Diff to previous 17071
ENH: CMakeLists.txt - Set a default build type if none was specified

Revision 17071 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:26:11 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31151 byte(s)
Diff to previous 17069
ENH: Add Slicer_EXTENSION_CMAKE_DIR variable

Directory <Slicer_SOURCE>/Extensions/CMake will contains macros, function
and block specific to the extensions.

Revision 17069 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:26:06 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31039 byte(s)
Diff to previous 17065
STYLE: CMakeLists.txt - Add comments and blanck lines so that slicer option are organized better

Revision 17065 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:25:59 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30847 byte(s)
Diff to previous 17064
ENH: Use CMAKE_DEPENDENT_OPTION to conditionally add Slicer_USE_PYTHONQT_WITH_TCL and Slicer_USE_NUMPY

Revision 17064 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:25:58 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30807 byte(s)
Diff to previous 17063
ENH: Use CMAKE_DEPENDENT_OPTION to conditionally add Slicer_BUILD_BRAINSTOOLS option

The option should be added only if Slicer_BUILD_CLI is ON

Revision 17063 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:25:56 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30770 byte(s)
Diff to previous 17062
ENH: Include cmake module CMakeDependentOption

This module is useful to establish dependency between options.

Revision 17062 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:25:55 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30740 byte(s)
Diff to previous 17061
COMP: Do not add Slicer_CMAKE_DIR to the cache

Since Slicer_CMAKE_DIR is computed using the cached value Slicer_SOURCE_DIR,
there is no need to clutter the cache with an additional value.

Revision 17061 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 17 07:25:53 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30763 byte(s)
Diff to previous 17003
COMP: Do no append ${Slicer_BINARY_DIR}/CMake to CMAKE_MODULE_PATH

This path is not used to search for CMake modules

Revision 17003 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 13 17:12:18 2011 UTC (6 years, 4 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 30792 byte(s)
Diff to previous 17000
COMP: Slicer now depends on QtScript because of qCDashAPI

Revision 17000 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 13 07:33:26 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30783 byte(s)
Diff to previous 16980
ENH: Add external project qCDashAPI

This external project hosted on github.com/jcfr/qCDashAPI is
a small Qt based library allowing to easily query a CDash server.

Revision 16980 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 12 17:53:27 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30548 byte(s)
Diff to previous 16866
ENH: Use variable Slicer_QtPlugins_DIR instead of hardcoded "lib/QtPlugins"

Revision 16866 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 8 09:27:43 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30209 byte(s)
Diff to previous 16865
COMP: Consider ADDITIONAL_{C,CXX}_FLAGS when setting CMAKE_{C,CXX}_FLAGS

This should shut down the following warnings:

CMake Warning: The variable, 'ADDITIONAL_C_FLAGS', specified manually, was not used during the generation.
CMake Warning: The variable, 'ADDITIONAL_CXX_FLAGS', specified manually, was not used during the generation.

Revision 16865 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 8 09:27:41 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30163 byte(s)
Diff to previous 16855
COMP: Conditionally configure Slicer inner project with BUILD_BRAINSTOOLS

If Slicer_BUILD_CLI is OFF, this option shouldn't be set or used..

This should shut down the following warning:

CMake Warning: The variable, 'BUILD_BRAINSTOOLS', specified manually, was not used during the generation.

Revision 16855 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 8 03:01:38 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30077 byte(s)
Diff to previous 16842
COMP: Change default value of Slicer_INSTALL_ROOT to "."

Revision 16842 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 7 22:47:03 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30060 byte(s)
Diff to previous 16832
ENH: Update text displayed at configuration time when displaying architecture and system

Revision 16832 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 7 18:03:25 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30037 byte(s)
Diff to previous 16822
ENH: Include SlicerCPack in Utilities/LastConfigureStep/CMakeLists.txt

The packaging step should be done last and the subdirectory LastConfigureStep
is the appropriate place.

Revision 16822 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 6 21:01:14 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30239 byte(s)
Diff to previous 16805
BUG: CMakeLists.txt - Set library path so that execute_process(python..) works

Revision 16805 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:56:15 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29848 byte(s)
Diff to previous 16804
ENH: Remove deprecated QtDesigner python based launcher

Revision 16804 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:56:07 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30070 byte(s)
Diff to previous 16799
COMP: Add Slicer_BUILD_BRAINSTOOLS option at superbuild level.

Doing so will allow to dashboard to either enable or disable the built
of that module.

Note that the module is currently disable since the associated CLI
libraries can't be properly loaded in Slicer and also because the mac bundle
failed to be generated if it is enabled.

Revision 16799 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:55:36 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29703 byte(s)
Diff to previous 16792
COMP: On 64bit Windows we use a prebuilt tcl 8.5.

Probably should find a way to extract the version number rather than hardcode it.

Revision 16792 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:54:57 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29531 byte(s)
Diff to previous 16784
COMP: Merge Utilities/Package/CMakeLists.txt with SlicerCPack.cmake

* CompleteBundles.cmake{.in} has been renamed into SlicerCompleteBundles.cmake{.in}

Revision 16784 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:53:49 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29802 byte(s)
Diff to previous 16783
COMP: Change build and install dir associated with plugins, scripted and loadable modules

FixBundle expects library executable to be located no more than one
directory deep. For that reason, plugins, loadable and scripted module
are now built and install following this layout:

 <slicer-build>/plugins
               /qt-scripted-modules
               /qt-loadable-modules

 <slicer-install>/plugins
                 /qt-scripted-modules
                 /qt-loadable-modules

For matter of consistency, this apply to linux, mac and windows.

Revision 16783 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:53:42 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29894 byte(s)
Diff to previous 16775
COMP: Remove unused Slicer PLUGINS_CACHE_DIR variable

Revision 16775 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:47:56 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30047 byte(s)
Diff to previous 16772
COMP: Do not use 'Slicer_PYTHON_INSTALL_DIR' variable

Revision 16772 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:47:42 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30104 byte(s)
Diff to previous 16771
COMP: Simplify and fix definition of INSTALL dir

FreeSurfer library use INSTALL_SHARE_DIR instead of directly relying on
the value of Slicer_INSTALL_ROOT

BIN and LIB directory of either plugins, qt loadable and scripted modules
should be the same.

Revision 16771 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 4 06:47:35 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30164 byte(s)
Diff to previous 16723
ENH: Refactor Install rule variables to only be used in install commands.

Added a second set of variables named Slicer_<blah>_DIR which contain the appropriate directory prefixes such as bin lib share. These variables can be used reference file in the build or install trees such as the input/output of a configure command. Slicer_INSTALL_<blah> should only be used for install commands as on the Mac these variables will be prefixed with Slicer.app\Contents which we likely do not want in the root of the build tree.

Revision 16723 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 1 04:06:36 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27792 byte(s)
Diff to previous 16719
COMP: Add SlicerMacroBuildModuleWidgets

This macro uses the more generic macro SlicerMacroBuildModuleQtLibrary
and update the variable Slicer_ModuleWidgets_INCLUDE_DIRS.
This variable is configured into SlicerConfig and can be re-used within
loadable extension.

Revision 16719 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 1 04:06:23 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27646 byte(s)
Diff to previous 16717
COMP: Add SlicerMacroBuildModuleQtLibrary

Convenient macro allowing to easily build a Qt sub library associated with
a loadable module.

Revision 16717 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 1 04:06:20 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27606 byte(s)
Diff to previous 16716
COMP: Rename SlicerMacroPythonWrapModuleLibrary into SlicerMacroPythonWrapModuleVTKLibrary

Revision 16716 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 1 04:06:18 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27603 byte(s)
Diff to previous 16715
COMP: Rename SlicerMacroBuildModuleLibrary into SlicerMacroBuildModuleVTKLibrary

Revision 16715 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 1 04:06:15 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27600 byte(s)
Diff to previous 16700
COMP: Require XML and WEBKIT Qt modules and rely on QT_LIBARIES/QT_INCLUDE_DIRS set in UseQt4.cmake

Revision 16700 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 30 20:47:58 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27589 byte(s)
Diff to previous 16699
COMP: Add SlicerMacroPythonTesting file

It contains the following helper macros:
  SLICER_ADD_PYTHON_TEST
  SLICER_ADD_PYTHON_UNITTEST

Revision 16699 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 30 20:47:56 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27553 byte(s)
Diff to previous 16687
COMP: Include CTest module is sufficient to enable testing

Revision 16687 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 27 21:24:16 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27576 byte(s)
Diff to previous 16678
ENH: Disable spashscreen associated with Slicer_LAUNCH_COMMAND

Revision 16678 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 27 21:24:00 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27555 byte(s)
Diff to previous 16677
ENH: Use CTK based launcher to run tests

Revision 16677 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 27 21:23:58 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27556 byte(s)
Diff to previous 16676
COMP: Rename LAUNCH_EXE into Slicer_LAUNCH_COMMAND

Revision 16676 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 27 21:23:44 2011 UTC (6 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27545 byte(s)
Diff to previous 16584
COMP: Rename Slicer_EXECUTABLE into Slicer_LAUNCHER_EXECUTABLE

Revision 16584 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 17 06:40:44 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27527 byte(s)
Diff to previous 16498
COMP: CMakeLists.txt - Add Slicer_EXECUTABLE variable

This variable should be considered when adding test
relying on Slicer executable

Revision 16498 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 23:04:46 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27481 byte(s)
Diff to previous 16490
COMP: Disable Batchmake

Waiting building issue related to curl and batchmake are resolved, let's
disable it.

Revision 16490 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:40:24 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27389 byte(s)
Diff to previous 16489
ENH: Slicer Base libraries, ModuleMRML and ModuleLogic targets are exported

Both global list Slicer_Libs_LIBRARIES and Slicer_Base_LIBRARIES have
been removed. It means libraries are expected to specify explicitly
their dependencies.

Variable Slicer_CORE_LIBRARY and Slicer_GUI_LIBRARY have been introduced.
They should be used each time it's required to link against qSlicerBaseQTCore
or qSlicerBaseQTGUI.

The variable MRML_LIBRARIES has been introduced, it should be used each
time a module is expected to link against the trhee libraries
 MRML, MRMLLogic and MRMLDisplayableManager. The rational behind this variable
is too anticipate a future possible relocation of MRML related libraries
outside of Slicer.

Waiting we setup a way to export the include directory associated with
all libraries so that they can be available to extension using SlicerConfig.
tThese diretories are still automatically appended to the global variables:
Slicer_Libs_INCLUDE_DIRS, Slicer_Base_INCLUDE_DIRS, Slicer_ModuleMRML_INCLUDE_DIRS
and Slicer_ModuleLogic_INCLUDE_DIRS

Revision 16489 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:40:20 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27363 byte(s)
Diff to previous 16488
COMP: Remove reference to OpenCV from Slicer/CMakeLists.txt

OpenCV used to be required by the OpenCV module. When this module and
associated tests will be ported to Slicer4, adding OpenCV as an external
project or as a dependency of the openCV extension could be considered.

Revision 16488 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:40:18 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28594 byte(s)
Diff to previous 16486
STYLE: Remove empty lines from Slicer/CMakeLists.txt

Revision 16486 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:40:15 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28602 byte(s)
Diff to previous 16485
COMP: Slicer Libs target are exported into SlicerTargets.cmake

Note also that of the library are build as standalone package, the associated
targets will be exported into <PROJECT_NAME>Targets.cmake

Revision 16485 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:40:09 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28322 byte(s)
Diff to previous 16475
COMP: Add ModuleMRML variables to SlicerConfig

Revision 16475 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:39:44 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28234 byte(s)
Diff to previous 16473
COMP: Add macro SlicerMacroBuildModuleMRML

The corresponding wrapped classes are imported into "slicer.modulemrml" python module

"slicer.modulemrml" is itself imported into slicer module.

Revision 16473 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:39:40 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27978 byte(s)
Diff to previous 16470
COMP: Factorize out code from SlicerMacroBuildModuleLogic into SlicerMacroBuildModuleLibrary and SlicerMacroPythonWrapModuleLibrary

Revision 16470 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 6 19:39:34 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27895 byte(s)
Diff to previous 16411
COMP: Slicer_Libs_{LIBRARIES, INCLUDE_DIRS} are now set only in Libs/CMakeLists.txt

Revision 16411 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 28 20:51:46 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28041 byte(s)
Diff to previous 16408
COMP: Logic of modules can now link and include header associated with other module logic

The following variables have been introduced
 Slicer_ModuleLogic_INCLUDE_DIRS
 Slicer_ModuleLogic_LIBRARY_DIRS
 Slicer_ModuleLogic_LIBRARIES

Revision 16408 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 28 20:51:39 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27865 byte(s)
Diff to previous 16396
COMP: Remove unused variables from Slicer CMakeLists.txt

Revision 16396 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:30:22 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28189 byte(s)
Diff to previous 16382
ENH: Add option Slicer_BUILD_EXTENSIONS

By default disabled.

If enabled, the *.s4ext file within the Extensions directory will be
parsed and an ExternalProject target specific to each one of them and
depending on Slicer will be added.

Revision 16382 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:57 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28117 byte(s)
Diff to previous 16381
STYLE: Remove extra comment and fix style in Slicer/CMakeLists.txt

Revision 16381 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:55 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28194 byte(s)
Diff to previous 16380
ENH: Add SlicerMacroExtractRepositoryInfo

This macro allows to conveniently extract information associated with a
checkout of either git, git-svn or svn.

Note that CVS support still need to be added.

Revision 16380 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:54 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28649 byte(s)
Diff to previous 16375
ENH: Change SlicerBlockDiscoverSystemNameAndBits into a macro

Doing so will allow to re use the macro with extension

Revision 16375 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:46 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28615 byte(s)
Diff to previous 16373
COMP: Rename Utilities/Package/CMakeLists.txt into SlicerCPack.cmake

Revision 16373 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:42 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28625 byte(s)
Diff to previous 16371
COMP: Factor out code related to C/CXX flags to that it could be re-used within extension

Revision 16371 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:39 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31048 byte(s)
Diff to previous 16370
COMP: Update SlicerBlockFindQtAndCheckVersion, and also reorganize VTK, CTK and Qt discovery

VTK and CTK should be found first, then using the block SlicerBlockFindQtAndCheckVersion
it's easy to make sure the Qt version used to build both CTK and VTK are equal
and satisfy Slicer_REQUIRED_QT_VERSION condition.

Revision 16370 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:37 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30507 byte(s)
Diff to previous 16369
ENH: Factor out CMake code used to check platform into SlicerBlockPlatformCheck.cmake

Revision 16369 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:35 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30864 byte(s)
Diff to previous 16367
STYLE: Rename SlicerDiscoverSystemNameAndBits into SlicerBlockDiscoverSystemNameAndBits

Revision 16367 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:31 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30859 byte(s)
Diff to previous 16366
STYLE: Rename "SlicerFindQtAndCheckVersion" into "SlicerBlockFindQtAndCheckVersion"

Revision 16366 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:28 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30854 byte(s)
Diff to previous 16361
COMP: Update CMake policy requirements

Revision 16361 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:29:07 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31891 byte(s)
Diff to previous 16353
COMP: Add Slicer_INSTALL_DEVELOPMENT option - By default OFF

For now, this is *just* a regular variable instead of being a CMake Option.
In order to be able to provide a developer package. More work is required.

Revision 16353 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:44 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31142 byte(s)
Diff to previous 16352
COMP: Remove occurences of Slicer_USE_QT variable

Revision 16352 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:41 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31604 byte(s)
Diff to previous 16351
COMP: Remove CMake/CMakeLists.txt, copy and comment install rules into CMakeLists.txt

Revision 16351 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:39 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31540 byte(s)
Diff to previous 16350
COMP: Added Utilites/LastConfigureStep

The commands in this directory are intended to be executed as
the end of the whole configuration process, as a "last step".
This directory is typically the last add_subdirectory in the
main CMakeLists.txt.

Revision 16350 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:38 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31505 byte(s)
Diff to previous 16349
COMP: Remove reference to Slicer_INSTALL_MODULES_*_DIR variables

Revision 16349 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:35 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32247 byte(s)
Diff to previous 16345
COMP: Do not user SKIP_*_BUILD_SETTINGS_FILE anymore

The command CMAKE_EXPORT_BUILD_SETTINGS(...) was used by
to generate settings file.  As of CMake 2.8 the
functionality of this command has been dropped as it was deemed
harmful (confusing users by changing their compiler).

Revision 16345 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:23 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32574 byte(s)
Diff to previous 16344
COMP: Factor out VTK specific python wrapping code into vtkMacroKitPythonWrap

Revision 16344 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:19 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32538 byte(s)
Diff to previous 16342
COMP: Update VTK external project to "slicer-4.0-gamma"

This branch contains the most recent VTK updates

Since VTK now contains a class named vtkImageSlicer, the one in MRMLogics
has been renamed into vtkImageLinearReslicer since it was based on vtkImageReslicer
and specialied for the linear case.

Note also that VTK_LIBRARIES is now exposed by VTKConfig, it means this variable
will contain all the  library built within VTK after the VTK_USE_FILE
is included.

Revision 16342 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:13 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32532 byte(s)
Diff to previous 16340
COMP: Properly update CMAKE_MODULE_PATH and simplify the way macro are imported

Revision 16340 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:10 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32679 byte(s)
Diff to previous 16339
COMP: Introduced variable Slicer_REQUIRED_QT_MODULES

This variable will be used within UseSlicer when building extension

At configuration time, the list of enabled and used Qt modules is also
printed.

Revision 16339 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:28:08 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32621 byte(s)
Diff to previous 16328
COMP: Factored out CMake code used to find Qt4 and check its version

Revision 16328 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:27:50 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33418 byte(s)
Diff to previous 16327
COMP: Change SlicerMacroToday into SlicerFunctionToday

Revision 16327 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 26 08:27:48 2011 UTC (6 years, 5 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33263 byte(s)
Diff to previous 16305
ENH: Also use SlicerMacroToday within CMakeLists.txt to update Slicer_VERSION_PATCH

Revision 16305 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 23 07:33:47 2011 UTC (6 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33792 byte(s)
Diff to previous 16277
COMP: Remove reference to LoadableModule project

Revision 16277 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 19 18:26:57 2011 UTC (6 years, 6 months ago) by haehn
Original Path: trunk/CMakeLists.txt
File length: 33857 byte(s)
Diff to previous 16257
COMP: Removed links to Modules/EMSegment since this does not exist anymore.

Revision 16257 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 14 12:25:16 2011 UTC (6 years, 6 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 34519 byte(s)
Diff to previous 16245
ENH: Set bundle location to . for now. If one day Slicer wishes to ship it's bundle in a directory then we would define that with Slicer_BUNDLE_LOCATION

Revision 16245 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 12 18:32:25 2011 UTC (6 years, 6 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 34516 byte(s)
Diff to previous 16189
ENH: Add a bundle location variable for use when building on Mac.

Revision 16189 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 2 06:06:35 2011 UTC (6 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34449 byte(s)
Diff to previous 16188
COMP: Remove unused "CMake/RemoveTemporaryFiles.cmake" file

Revision 16188 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 2 06:06:33 2011 UTC (6 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34600 byte(s)
Diff to previous 16173
COMP: Remove obsolete "Slicer3SampleBuildTest.cmake" file

Revision 16173 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 2 05:53:55 2011 UTC (6 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34758 byte(s)
Diff to previous 16168
ENH: Modernize doxygen Documentation generation mechanism

Revision 16168 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 2 00:07:54 2011 UTC (6 years, 6 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34210 byte(s)
Diff to previous 16159
COMP: Remove 'Slicer3PersistenceMacros' and use CMake native function

Calling SET with the FORCE option provide the same functionality

Revision 16159 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 1 10:42:59 2011 UTC (6 years, 6 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 35118 byte(s)
Diff to previous 16158
ENH: Change package versioning to list the date instead of svn revision.

Revision 16158 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 1 10:05:48 2011 UTC (6 years, 6 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 34746 byte(s)
Diff to previous 15985
ENH: Change version number to gamma.

Revision 15985 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 18 23:59:31 2011 UTC (6 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34746 byte(s)
Diff to previous 15923
COMP: Pass --no-undefined flag to the linker with GNUCXX compiler is used.

Doing so will alert the linux/apple developer if there are undefined symbol at
build time.

Revision 15923 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jan 30 01:47:13 2011 UTC (6 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 34682 byte(s)
Diff to previous 15856
COMP: Remove ref to KWWidgets, Slicer_USE_PYTHON, Slicer_BUILD_MODULES, ...

KWWidgets external project has been removed

Reference to Slicer_USE_PYTHON have been removed

Reference to Slicer_BUILD_MODULES has been removed

Launcher.tcl also has been cleaned

Deprecated function from qSlicerCoreApplication have been removed

Reference to Tcl wrapping within the core component of Slicer have been
removed. note that Slicer/Libs haven't been updated. Indeed, in case other
project want to benefit from Tcl wrapping ...

Revision 15856 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 18 23:21:45 2011 UTC (6 years, 9 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 40265 byte(s)
Diff to previous 15855
BUG: fix default repository for ITK check out

Revision 15855 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 18 23:19:09 2011 UTC (6 years, 9 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 40265 byte(s)
Diff to previous 15854
BUG: fix tags for default branch to check out

Revision 15854 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 18 22:59:07 2011 UTC (6 years, 9 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 40265 byte(s)
Diff to previous 15841
COMP: expose option to select git repository and tag to use with superbuild

Revision 15841 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 14 22:15:41 2011 UTC (6 years, 9 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 39733 byte(s)
Diff to previous 15829
ENH: Expose cmake variables into the build dir of Slicer for external use.

Add an example to compile a module outside of slicer.

Revision 15829 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 13 15:09:38 2011 UTC (6 years, 9 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 39252 byte(s)
Diff to previous 15809
ENH: Officialy require CMake 2.8.2 as many of the sub modules already do.

Revision 15809 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 10 23:40:15 2011 UTC (6 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39250 byte(s)
Diff to previous 15741
COMP: Designer.py - Fix loading of qMRMLWidgets plugins

Revision 15741 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 6 21:59:12 2011 UTC (6 years, 9 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 39539 byte(s)
Diff to previous 15675
ENH: Update patch name to be beta 2.

Revision 15675 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 18 17:31:56 2010 UTC (6 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 39537 byte(s)
Diff to previous 15674
COMP: revert to use of CMake 2.8 and STYLE: remove diag message

Revision 15674 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 18 15:14:15 2010 UTC (6 years, 10 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 39579 byte(s)
Diff to previous 15673
BUG: Simplify the logic evaluating if we will enable the fstack flags and fix some comparison bugs.

Revision 15673 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 18 15:07:22 2010 UTC (6 years, 10 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 39527 byte(s)
Diff to previous 15666
BUG: Simplify the logic evaluating if we will enable the fstack flags and fix some comparison bugs.

Revision 15666 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 18 01:04:47 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39577 byte(s)
Diff to previous 15658
COMP: CMakeLists.txt - Check if CMAKE_BUILD_TYPE is defined to conditionally add fstack-protector-all flag

Revision 15658 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 17 22:55:21 2010 UTC (6 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 39729 byte(s)
Diff to previous 15651
COMP: fix warning about undefined symbol with CMAKE_BUILD_TYPE not set (which is the default)

Revision 15651 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 17 19:41:49 2010 UTC (6 years, 10 months ago) by zach.mullen
Original Path: trunk/CMakeLists.txt
File length: 39548 byte(s)
Diff to previous 15646
ENH: Move BRAINSTools testing data to midas.kitware.com and reference the remote data in the tests

Revision 15646 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 17 16:55:43 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39303 byte(s)
Diff to previous 15627
COMP: Conditionally includes '-fstack-protector-all' when building with Gcc

With older version of gcc supporting the flag -fstack-protector-all,
an extra dependency to libssp.so is introduced. If gcc version is
less than 4.4.0 and the build type is Release let's not include the flag.

Doing so should allow to build Release package made for distribution using older linux distro
without introducing an extra dependency.

Revision 15627 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 16 19:05:02 2010 UTC (6 years, 10 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 38744 byte(s)
Diff to previous 15623
ENH: Change version number to beta-r<svn-revision>.

Revision 15623 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 16 17:13:34 2010 UTC (6 years, 10 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 38567 byte(s)
Diff to previous 15606
ENH: Upgrade Slicer to 4.0 beta-1

Revision 15606 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 16 02:25:12 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38566 byte(s)
Diff to previous 15525
COMP: Added install rules for libarchive

Revision 15525 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 10 23:17:57 2010 UTC (6 years, 10 months ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 38516 byte(s)
Diff to previous 15489
ENH: Build libarchive as an external project.

Revision 15489 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 9 18:22:39 2010 UTC (6 years, 10 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 38777 byte(s)
Diff to previous 15484
BUG: Fix configuration of SlicerVersion.txt

Revision 15484 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 9 06:31:37 2010 UTC (6 years, 10 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 38786 byte(s)
Diff to previous 15474
ENH: Add libarchive to extract zip/tar archives

Revision 15474 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 8 08:59:02 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38320 byte(s)
Diff to previous 15463
COMP: CMakeLists.txt - Declaration of Slicer_INSTALL_* variable done before including Superbuild

Revision 15463 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 8 06:02:24 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38111 byte(s)
Diff to previous 15449
ENH: Switch to version 0.1.2 of CTKAppLauncher

The launcher is now configured using relatively to a Target instead of the
location of a generated executable. TARGET parameter should be specified
instead of APPLICATION_PATH

Also move the call to the macro at in the CMakeLists where the associated
target is defined.

Related changes:
 - Launcher properly configured on windows by using custom_target
and ensuring the intermediate build directory is properly passed
 - Remove suffix ADDITIONAL_ from macro signature
 - Argument given on the command line are now properly passed to the target application

Revision 15449 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 7 00:43:48 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39654 byte(s)
Diff to previous 15448
COMP: Rename SlicerModuleLogicMacros.cmake into SlicerMacroBuildModuleLogic.cmake

Revision 15448 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 7 00:43:41 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39650 byte(s)
Diff to previous 15447
COMP: Rename DiscoverSystemNameAndBits into SlicerDiscoverSystemNameAndBits

Revision 15447 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 7 00:43:38 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39644 byte(s)
Diff to previous 15446
COMP: Rename SlicerParseArgumentsMacro.cmake into SlicerMacroParseArguments.cmake

Revision 15446 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 7 00:43:35 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39644 byte(s)
Diff to previous 15430
COMP: Rename SlicerTodayMacro.cmake into SlicerMacroToday.cmake

Revision 15430 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 7 00:23:00 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39644 byte(s)
Diff to previous 15420
COMP: Add convenient macro "slicerMacroBuildCLI" allowing to build CLI

Revision 15420 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 6 02:35:11 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39603 byte(s)
Diff to previous 15410
ENH: Added QTScripted module factory and associated classes

The QTScripted module factory is composed of:
 - the factory itself
 - concrete implementations of qSlicerLoadableModule, qSlicerAbstractModuleWidget
and vtkSlicerModuleLogic

These concrete implementations are:
- qSlicerScriptedLoadableModuleWidget
- qSlicerScriptedLoadableModule
- vtkSlicerScriptedLoadableModuleLogic

All have a method named "setPythonSource".


After setting the python script, the corresponding python implementation
will be retrieved.

Revision 15410 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 6 02:34:05 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38971 byte(s)
Diff to previous 15377
COMP: Re-add option Slicer_USE_NUMPY - enabled by default

Revision 15377 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 6 02:31:40 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38813 byte(s)
Diff to previous 15376
COMP: Set qMRMLWidgets_WRAP_PYTHON to ON

Revision 15376 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 6 02:31:34 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38814 byte(s)
Diff to previous 15374
COMP: Use ctkMacroCompilePythonScript instead of Slicer_compile_python_scripts

Revision 15374 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 6 02:31:22 2010 UTC (6 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38922 byte(s)
Diff to previous 15261
COMP: Remove unused variable in CMakeLists.txt

Revision 15261 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 16 19:09:26 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38979 byte(s)
Diff to previous 15226
COMP: Option Slicer_USE_CTKAPPLAUNCHER now enabled by default

Enabling this option should enable the configuration of the new launcher.
Running Slicer-build/bin/../Slicer will allow to test it.

When it will have been tested, the second step will be the update of
the code still relying on the Tcl based launcher.

Revision 15226 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 4 19:06:23 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38980 byte(s)
Diff to previous 15201
BUG: Add FindCTK.cmake to repository

Doing so will avoid to download it directly from github

Revision 15201 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 29 20:35:11 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39857 byte(s)
Diff to previous 15194
COMP: Make sure Slicer_{C,CXX}_FLAGS is initialized with CMAKE_{C,CXX}_FLAGS_INIT

Revision 15194 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 29 06:08:30 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39811 byte(s)
Diff to previous 15191
BUG: CTestCustom is configured in both top-level and inner directory

That should allows ctest to find the file both when run using a
dashboard script or run from the command line in the inner build directory

Revision 15191 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 29 03:26:58 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39615 byte(s)
Diff to previous 15189
COMP: Add default C/CXX flags associated with MSVC compiler

Revision 15189 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 14:59:54 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39456 byte(s)
Diff to previous 15188
BUG: Revert "BUG: Configure "CTestConfig.cmake.in" not "CTestConfig.cmake""

Revision 15188 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 14:40:04 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39459 byte(s)
Diff to previous 15186
BUG: Configure "CTestConfig.cmake.in" not "CTestConfig.cmake"

Revision 15186 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 06:08:26 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39456 byte(s)
Diff to previous 15185
COMP: Remove extra check and add REQUIRED argument to Find_Package

Revision 15185 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 05:35:29 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39934 byte(s)
Diff to previous 15184
COMP: Do not use C/CXX flag: -Wsign-promo

Revision 15184 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 05:35:27 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39897 byte(s)
Diff to previous 15183
COMP: Added C/CXX flag: -Wno-deprecated

Allow to shutdown the following warning:
...backward_warning.h:28:2: warning: #warning This file includes at
least one deprecated or antiquated header which may be removed without
 further notice at a future date. Please use a non-deprecated interface
with equivalent functionality instead. For a listing of replacement
headers and interfaces, consult the file backward_warning.h. To disable
this warning use -Wno-deprecated.

Revision 15183 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 05:35:21 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39881 byte(s)
Diff to previous 15181
COMP: Do not use C/CXX flag: -Wold-style-cast

Compiler is way to verbose.

Revision 15181 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 04:29:07 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39858 byte(s)
Diff to previous 15177
BUG: Make sure CMake module path is update before any call to Find_package()

Revision 15177 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:24 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39960 byte(s)
Diff to previous 15176
ENH: C/CXX coverage flags automatically added if WITH_COVERAGE ON and compiler is GNUCXX

Revision 15176 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:22 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 39491 byte(s)
Diff to previous 15175
ENH: Regular C/CXX flags automatically added for GNUCXX compiler

The macro SlicerFunctionCheckCompilerFlags allows to check
if a given flag supported by the underlying compiler

Revision 15175 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:19 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 38749 byte(s)
Diff to previous 15174
ENH: Add ADDITIONAL_{C,CXX}_FLAGS options

These options allow to pass flags that will be appended to the ones
internally determined.

The variable CMAKE_{C,CXX}_FLAGS will then be set using:
 - the list of internal flags: Slicer_{C,CXX}_FLAGS
 - the additional flags passed at configuration time: ADDITIONAL_{C,CXX}_FLAGS

Revision 15174 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:17 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 37836 byte(s)
Diff to previous 15173
ENH: Simplify and optimize superbuild

External project specification have been added to SuperBuild.cmake

Running:
  1) "cmake ../Slicer4" => Build using SuperBuild
  2) "cmake -DSlicer_SUPERBUILD:BOOL=OFF ../Slicer4" => Build without Superbuild

In case (2), all external dependencies (VTK, ITK, ...) will have
to be specified manually.

Layout of the CMakeLists.txt has been reviewed to improve readability

Factored out cmake code and use macro SlicerMacroEmptyExternalProject
in VTK, ITK and CTK external project description.

${ep_common_args} has been introduced to contain option common
to all external project.

launcher.tcl.in has been updated to properly behave when KWWidgets_*_DIR
are not specified.

CTestCustom files has been merged into one file now located
in CMake subdirectory

SlicerFindQt.cmake has been removed, Qt discovery is now handled
directly in both CMakeLists.txt and SuperBuild.cmake

{Subversion_SVN, GIT}_EXECUTABLE are now discovered at superbuild
configure time. In case of error a message will be immediately thrown
in case of problem.

Dashboard template and driver script have been updated to reflect new
directory layout.

Revision 15173 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:10 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32968 byte(s)
Diff to previous 15172
BUG: Properly detect case where git-svn is use when generating SlicerVersion.txt

Revision 15172 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:08 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32945 byte(s)
Diff to previous 15171
STYLE: CMakeLists - Mark Slicer_USE_KWWIDGETS as deprecated

Revision 15171 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 28 00:00:06 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32894 byte(s)
Diff to previous 15170
STYLE: CMakeLists.txt - Add comments

Revision 15170 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 27 23:50:02 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32699 byte(s)
Diff to previous 15166
STYLE: Use BUILD_TESTING variable

Change occurrences of Slicer_BUILD_TESTING into BUILD_TESTING

Revision 15166 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 26 03:55:16 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32983 byte(s)
Diff to previous 15164
BUG: CMakeLists.txt - Fix typo error - Change Find_Package(GIT) into Find_Package(Git)

Revision 15164 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:48:19 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32983 byte(s)
Diff to previous 15161
COMP: Use GIT_EXECUTABLE instead of Git_EXECUTABLE

Revision 15161 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:22:30 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32983 byte(s)
Diff to previous 15160
COMP: Enable CMake policy CMP00{02, 04, 05, 06, 07, 08, 09, 11, 14}

CMP0002: Logical target names must be globally unique.
CMP0004: Libraries linked may NOT have leading or trailing whitespace.
CMP0005: Preprocessor definition values are now escaped automatically.
CMP0006: Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION.
CMP0007: List command no longer ignores empty elements.
CMP0008: Libraries linked by full-path must have a valid library file name.
CMP0009: FILE GLOB_RECURSE calls should not follow symlinks by default.
CMP0011: Included scripts do automatic cmake_policy PUSH and POP.
CMP0014: Input directories must have CMakeLists.txt

Revision 15160 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:22:28 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32992 byte(s)
Diff to previous 15159
COMP: Enable CMake policy CMP0010

CMP0010 - Bad variable reference syntax is an error.

Revision 15159 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:22:24 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32993 byte(s)
Diff to previous 15158
COMP: Add missing cmake_minimum_required statement

Revision 15158 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:22:22 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32796 byte(s)
Diff to previous 15157
COMP: Enable cmake policy CMP0013

CMP0013 - Duplicate binary directories are not allowed.

Revision 15157 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:22:18 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32797 byte(s)
Diff to previous 15155
COMP: Enable CMake policy CMP0001 and update scripts accordingly

CMP0001 : CMAKE_BACKWARDS_COMPATIBILITY should no longer be used.

Revision 15155 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:21:41 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32798 byte(s)
Diff to previous 15154
STYLE: CMakeLists - Documented "CMake policy enabling" code

Revision 15154 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 25 23:21:38 2010 UTC (6 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31593 byte(s)
Diff to previous 15114
COMP: CMake 2.8.2 is now required

Revision 15114 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:44:09 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31591 byte(s)
Diff to previous 15113
COMP: Rename *Slicer3Config files into *SlicerConfig

Revision 15113 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:44:00 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31596 byte(s)
Diff to previous 15108
COMP: Rename project Slicer3 into Slicer

Revision 15108 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:41:29 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31655 byte(s)
Diff to previous 15107
COMP: Rename Slicer3_{Base,Libs}* into Slicer_{Base,Libs}*

Revision 15107 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:40:46 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31667 byte(s)
Diff to previous 15106
COMP: Rename Slicer3Version.txt into SlicerVersion.txt

Revision 15106 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:40:42 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31696 byte(s)
Diff to previous 15100
COMP: Remove unused option Slicer3_USE_VTK_CVSHEAD

Revision 15100 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:40:06 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31928 byte(s)
Diff to previous 15097
COMP: Rename Slicer3_USE_NUMPY into Slicer_USE_NUMPY

Revision 15097 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:39:47 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31934 byte(s)
Diff to previous 15095
COMP: Rename Slicer3_HOME into Slicer_HOME

Revision 15095 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:38:56 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31941 byte(s)
Diff to previous 15094
COMP: Rename Slicer3_BUILD_MODULES into Slicer_BUILD_MODULES

Revision 15094 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:38:50 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31947 byte(s)
Diff to previous 15093
COMP: Rename Slicer3_BUILD_TESTING into Slicer_BUILD_TESTING

Revision 15093 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:38:42 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31951 byte(s)
Diff to previous 15092
COMP: Rename Slicer3_INSTALL_QTLOADABLEMODULES* into Slicer_INSTALL_QTLOADABLEMODULES*

Revision 15092 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:34:15 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31955 byte(s)
Diff to previous 15091
COMP: Rename Slicer3_WITH_LIBRARY_VERSION  into Slicer_WITH_LIBRARY_VERSION

Revision 15091 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:34:10 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31965 byte(s)
Diff to previous 15090
COMP: Rename Slicer3_USE_KWWIDGETS into Slicer_USE_KWWIDGETS

Revision 15090 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:33:56 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31984 byte(s)
Diff to previous 15089
COMP: Rename Slicer3_USE_PYTHON into Slicer_USE_PYTHON

Revision 15089 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:33:34 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31986 byte(s)
Diff to previous 15088
COMP: Rename Slicer3_USE_PYTHONQT into Slicer_USE_PYTHONQT

Revision 15088 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:33:20 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 31993 byte(s)
Diff to previous 15087
COMP: Rename Slicer3_USE_QT into Slicer_USE_QT

Revision 15087 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:33:07 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32008 byte(s)
Diff to previous 15086
COMP: Rename Slicer3_BUILD_CLI into Slicer_BUILD_CLI

Revision 15086 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:32:57 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32012 byte(s)
Diff to previous 15085
COMP: Rename Slicer3_BUILD_QTLOADABLEMODULES into Slicer_BUILD_QTLOADABLEMODULES

Revision 15085 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:32:53 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32017 byte(s)
Diff to previous 15084
COMP: Rename Slicer3_USE_OPENCV into Slicer_USE_OPENCV

Revision 15084 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:32:49 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32019 byte(s)
Diff to previous 15083
COMP: Rename Slicer3_USE_OPENIGTLINK into Slicer_USE_OPENIGTLINK

Revision 15083 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:32:44 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32022 byte(s)
Diff to previous 15082
COMP: Rename Slicer3_USE_MIDAS into Slicer_USE_MIDAS

Revision 15082 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:32:40 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32024 byte(s)
Diff to previous 15081
COMP: Rename Slicer3_USE_BatchMake into Slicer_USE_BatchMake

Revision 15081 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 8 03:32:30 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 32027 byte(s)
Diff to previous 15080
STYLE: Simplify syntax in CMakeLists.txt

Revision 15080 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:31:31 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33060 byte(s)
Diff to previous 15077
COMP: Rename Slicer3ModuleLogicMacros.cmake into SlicerModuleLogicMacros.cmake

Revision 15077 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:30:29 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33061 byte(s)
Diff to previous 15076
COMP: Rename Slicer3FindQT.cmake into SlicerFindQT.cmake

Revision 15076 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:30:20 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33064 byte(s)
Diff to previous 15075
COMP: Rename Slicer3TodayMacro.cmake into SlicerTodayMacro.cmake

Revision 15075 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:30:10 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33065 byte(s)
Diff to previous 15073
COMP: Rename Slicer3ParseArgumentsMacro.cmake into SlicerParseArgumentsMacro.cmake

Revision 15073 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:29:55 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33066 byte(s)
Diff to previous 15072
COMP: Rename Slicer3CompilePythonScripts.cmake into SlicerCompilePythonScripts.cmake

Revision 15072 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:29:45 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33067 byte(s)
Diff to previous 15071
COMP: Rename variable Slicer3_CMAKE_DIR into Slicer_CMAKE_DIR

Revision 15071 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:29:35 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33080 byte(s)
Diff to previous 15070
COMP: Rename variables Slicer3_VERSION* into Slicer_VERSION*

Revision 15070 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 03:29:24 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33191 byte(s)
Diff to previous 15068
COMP: Rename variable Slicer3_INSTALL_* into Slicer_INSTALL_*

Revision 15068 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 7 02:41:43 2010 UTC (7 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 33239 byte(s)
Diff to previous 15050
ENH: Added option Slicer_USE_CTKAPPLAUNCHER allowing to test CTKAppLauncher

Revision 15050 - (view) (download) (annotate) - [select for diffs]
Modified Mon Oct 4 14:56:26 2010 UTC (7 years ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 31568 byte(s)
Diff to previous 14932
COMP: change default behavior to build a working slicer4

Revision 14932 - (view) (download) (annotate) - [select for diffs]
Modified Sat Sep 4 16:56:58 2010 UTC (7 years, 1 month ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 31522 byte(s)
Diff to previous 14909
ENH: On Mac we need to configure the path of each Qt Framework in the launcher.

Revision 14909 - (view) (download) (annotate) - [select for diffs]
Modified Fri Sep 3 21:53:07 2010 UTC (7 years, 1 month ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 30965 byte(s)
Diff to previous 14878
BUG: Need to hardcode the version of tcl as well so that we can properly install tcl on a Qt build done from a superbuild buildtree.

Revision 14878 - (view) (download) (annotate) - [select for diffs]
Modified Thu Sep 2 17:37:25 2010 UTC (7 years, 1 month ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 30906 byte(s)
Diff to previous 14877
ENH: Increment version to 4.0.aplha (is this what we want it to be?). Also find python when we are building PYTHONQT.

Revision 14877 - (view) (download) (annotate) - [select for diffs]
Modified Thu Sep 2 15:40:55 2010 UTC (7 years, 1 month ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 30854 byte(s)
Diff to previous 14828
ENH: Upgrade Slicer to 4.0.0

Revision 14828 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 1 21:09:38 2010 UTC (7 years, 1 month ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 30854 byte(s)
Diff to previous 14822
COMP: fix the path to incrtcl in the case where kwwidgets isn't being used

Revision 14822 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 1 19:35:37 2010 UTC (7 years, 1 month ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 30474 byte(s)
Diff to previous 14819
ENH: don't undefine Slicer3_INSTALL_MODULES_INCLUDE_DIR so that module header files aren't installed in the root of your system drive.

Revision 14819 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 1 18:08:35 2010 UTC (7 years, 1 month ago) by partyd
Original Path: trunk/CMakeLists.txt
File length: 30464 byte(s)
Diff to previous 14602
COMP: Provide the link directory for linking PythonQt when in use.

Revision 14602 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 17 21:58:39 2010 UTC (7 years, 2 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 30412 byte(s)
Diff to previous 14580
COMP: stub out qMRMLWidgets PythonQt for now until windows 'line too long' issue is resolved

Revision 14580 - (view) (download) (annotate) - [select for diffs]
Modified Mon Aug 16 18:32:47 2010 UTC (7 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30411 byte(s)
Diff to previous 14537
COMP: Added macro Slicer3_compile_python_scripts

Factored out CMake code from Base/Python/CMakeLists.txt for future re-use

Revision 14537 - (view) (download) (annotate) - [select for diffs]
Modified Wed Aug 11 05:58:19 2010 UTC (7 years, 2 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30267 byte(s)
Diff to previous 14308
ENH: PythonQt wrapping - CTK is now configured with CTK_WRAP_PYTHONQT_LIGHT:ON

The macro ctkMacroWrapPythonQt is also included in the main CMakeLists.txt

Revision 14308 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 22 20:18:34 2010 UTC (7 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 30001 byte(s)
Diff to previous 14300
COMP: Make sure EMSegment{Algo, Reg, MRML, Graph} lib compile properly when KWWidgets is OFF

 - Make sure Tcl wrapping code is excluded when KWWidgets is OFF
 - Include the corespinding subdirectory also when Slicer3_BUILD_QTLOADABLEMODULES is ON
 - Include Slicer3ModulesMacros.cmake

Revision 14300 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 22 16:40:39 2010 UTC (7 years, 3 months ago) by haehn
Original Path: trunk/CMakeLists.txt
File length: 29905 byte(s)
Diff to previous 14285
ENH: Added a script for running Valgrind with one module and SuperBuild (QT only).

Revision 14285 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 22 03:05:56 2010 UTC (7 years, 3 months ago) by blezek
Original Path: trunk/CMakeLists.txt
File length: 29718 byte(s)
Diff to previous 14258
ENH: Added support for FilteredTractography.

Added a stand-alone version of weave.  This allows the FilteredTractography plugin to be built once for users, without requiring a compiler to be installed on the system.  Tested for the moment on Mac, next stop Windows and Linux.


Revision 14258 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 20 14:29:55 2010 UTC (7 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29689 byte(s)
Diff to previous 14245
COMP: EMSegment - Make sure EMSegment is build after EMSegment{Graph, Registration, Algorithm, MRML} and Volumes libraries

That should address the following issue:  http://www.cdash.org/CDash/viewBuildError.php?buildid=670245

Revision 14245 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 19 20:10:07 2010 UTC (7 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 29363 byte(s)
Diff to previous 14117
COMP: Split EMSegment in multiple libraries to be used by the QtPort

There are now 4 additionnal libraries:
 - EMSegmentAlgorithm (depends on VTK)
 - EMSegmentMRML (depends on MRML, ITK, EMSegmentAlgorithm, vtkSlicerVolumeLogic, SliceBaseLogic)
 - EMSegmentGraph (depends on VTK)
 - EMSegmentRegistration (depends on vtkITK)

Doing so allow to build these libraries also if Slicer3_USE_KWWIDGETS is OFF.

Note also that vtkEMSegmentMRMLManager has been moved into EMSegmentMRML library

Revision 14117 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 12 21:58:06 2010 UTC (7 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28847 byte(s)
Diff to previous 14071
BUG: Fix CMakeLists.txt to automatically include Logic directory if they are in sub-sub-directory

The build system will look for either:
Modules/ModuleName/Logic
or
Modules/ModuleName/something/Logic

Revision 14071 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 7 22:03:18 2010 UTC (7 years, 3 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 28875 byte(s)
Diff to previous 14059
ENH: Separate the logic of the module "Fiber Bundles"

Revision 14059 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 6 15:36:51 2010 UTC (7 years, 3 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28398 byte(s)
Diff to previous 14017
COMP: Add definition to disable warning C4996 specific to Microsoft Dev studio 9.0

Revision 14017 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 2 16:17:06 2010 UTC (7 years, 3 months ago) by domibel
Original Path: trunk/CMakeLists.txt
File length: 28167 byte(s)
Diff to previous 13896
COMP: bump the version number for the experimental builds

Revision 13896 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 22 02:46:58 2010 UTC (7 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28167 byte(s)
Diff to previous 13895
COMP: CMakeLists.txt / downloadFile - Review the condition used to check if download should re-attempt.

Revision 13895 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 22 02:24:14 2010 UTC (7 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 28106 byte(s)
Diff to previous 13788
COMP: CMakeLists.txt - Update cmake macro downloadFile to check if the file is empty and attempt re-download if needed

This macro is mainly used to download FindCTK.cmake from the commontk
github repository.

Revision 13788 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 14 16:39:28 2010 UTC (7 years, 4 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 27916 byte(s)
Diff to previous 13712
COMP: switch to new commontk account for CTK repository

Revision 13712 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 9 16:05:03 2010 UTC (7 years, 4 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 27914 byte(s)
Diff to previous 13513
COMP: In CMakeLists.txt, downloadFile cmake helper macro will first check if the file exist

Revision 13513 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 27 13:52:06 2010 UTC (7 years, 4 months ago) by tokuda
Original Path: trunk/CMakeLists.txt
File length: 27867 byte(s)
Diff to previous 13315
COMP: adding variables in CMakeLists.txt for OpenCV library

Revision 13315 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 11 16:43:17 2010 UTC (7 years, 5 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 26631 byte(s)
Diff to previous 13199
ENH: Merge Slicer4 branch on trunk rev12438 -> rev13314

Revision 13199 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 4 04:12:36 2010 UTC (7 years, 5 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 25911 byte(s)
Diff to previous 13148
ENH: Setting up configuration for automating the process of running Valgrind in the CLI Modules.


Revision 13148 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 30 22:18:37 2010 UTC (7 years, 5 months ago) by fedorov
Original Path: trunk/CMakeLists.txt
File length: 25703 byte(s)
Diff to previous 12514
ENH: configure the convenience scripts for individual tests


Revision 12514 - (view) (download) (annotate) - [select for diffs]
Modified Sun Mar 28 16:13:08 2010 UTC (7 years, 6 months ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 25381 byte(s)
Diff to previous 12450
ENH: Encapsulated the SlicerExecutionModel requirements so that it is easier to develop compliant applications without the burden of building all of Slicer.

Revision 12450 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 24 20:28:47 2010 UTC (7 years, 6 months ago) by lassoan
Original Path: trunk/CMakeLists.txt
File length: 25318 byte(s)
Diff to previous 12241
BUG: Added missing OpenIGTLink directory to Slicer3SetupPaths.bat (the problem was that modules that relied on OpenIGTLink were not displayed in the module list when Slicer was started by running Slicer3SetupPaths.bat & Slicer3-real.exe)

Revision 12241 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 25 22:33:49 2010 UTC (7 years, 7 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 25289 byte(s)
Diff to previous 12239
COMP: Rename Slicer3_USE_CVS_HEAD into Slicer3_USE_VTK_CVSHEAD

Revision 12239 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 25 22:20:36 2010 UTC (7 years, 7 months ago) by finetjul
Original Path: trunk/CMakeLists.txt
File length: 25283 byte(s)
Diff to previous 12222
ENH: Use vtkGPURayCastMapper as a volume rendering.

Revision 12222 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 25 21:34:25 2010 UTC (7 years, 7 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 25055 byte(s)
Diff to previous 12082
ENH: SlicerQT - Added option Slicer3_USE_PYTHONQT to the main CMakeLists.txt

Note that PythonQt isn't yet included in the superbuild or the getbuildtest process.

Revision 12082 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 9 19:57:34 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 24310 byte(s)
Diff to previous 12049
BUG: Update launch.tcl.in to update properly QT_PLUGIN_PATH with ConfigurationType (Debug, Release, ..) when required.

Revision 12049 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 8 08:09:01 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 24462 byte(s)
Diff to previous 11998
ENH: Add Slicer3_USE_KWWIDGETS to vtkSlicerConfigure.h.in

Revision 11998 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 5 03:04:00 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 24641 byte(s)
Diff to previous 11983
COMP: SlicerQT - launch.tcl.in is now configured to properly add QTLoadableModule, qCTKWidgets, qVTKWidgets and qMRMLWidgets libraries to the current process library path. QT_PLUGIN_PATH is also set properly.

Revision 11983 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 4 22:31:36 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 24155 byte(s)
Diff to previous 11921
ENH: SlicerQT - Added vtkConfigureVersion.h.in containing #ifdef related to Slicer version.

It allows to expose the following variable to the code:
  Slicer3_VERSION_MAJOR
  Slicer3_VERSION_MINOR
  Slicer3_VERSION_PATCH
  Slicer3_VERSION
  Slicer3_VERSION_FULL

Revision 11921 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 2 16:34:43 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23867 byte(s)
Diff to previous 11919
COMP: ${Slicer3_INSTALL_LIB_DIR}/launch.tcl.in is now configured independently of Slicer3_USE_KWWIDGETS

Revision 11919 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 2 16:08:21 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23940 byte(s)
Diff to previous 11916
COMP: BUILDNAME shouldn't be discover pragmatically ...

Revision 11916 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 2 05:14:29 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23935 byte(s)
Diff to previous 11913
COMP: SlicerQT - For now, launcher 'Slicer3' (based on startkits) is also configured if Slicer3_USE_KWWidgets is OFF.

Required to be able to run SlicerQT on a windows build.
./slicer3 --launch SlicerQT

Some test also expect the launcher 'Slicer3' to be present. (for example VTKITKReader)
On windows, the launcher is mandatory to run the test.

Revision 11913 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 1 19:38:09 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23865 byte(s)
Diff to previous 11907
COMP: CMakeLists.txt - Loop though the Modules/XXX/Logic only if Slicer is build with Slicer3_USE_KWWIDGETS OFF

That means that the Logic subdirectory should be included in the CMakeLists.txt
specigic to the Module.

Revision 11907 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 1 14:32:54 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23812 byte(s)
Diff to previous 11906
COMP: CMakeLists.txt - Remove extra include - Macro ListSubDirectories wasn't required

Revision 11906 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 1 13:37:28 2010 UTC (7 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 23882 byte(s)
Diff to previous 11905
COMP: back out reference to missing file

Revision 11905 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 1 07:13:13 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23881 byte(s)
Diff to previous 11901
COMP: If a Logic directory exists in a modules directory, the directory will be automatically added.

The process allowing to build the 'Logic' library of a module had been factorized out.
That way the dedicated libray is build and both the QTModule and the regular Module can link against it.

There is not need to add Win32 header file or any configure header.

Using the macro Slicer3_build_module_logic automatically configure a file
of the form ${PROJECT_NAME}Export.h.
For example vtkSlicerTractographyModuleLogicExport.h where
name of the project is 'vtkSlicerTractographyModuleLogic'

Note also that the Logic sub-directory should *NOT* be included in the module
main CMakeLists.txt

As a convention, the module logic library should composed as described below:
  vtkSlicer[MODULE_NAME]ModuleLogic

Revision 11901 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jan 31 21:03:28 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 23161 byte(s)
Diff to previous 11900
COMP: At configuration time, BUILDNAME is added to CMake cache.

Note: Its default value will be Slicer3_BUILD

Revision 11900 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jan 31 18:34:59 2010 UTC (7 years, 8 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 22837 byte(s)
Diff to previous 11644
COMP: Update the main CMakeLists.txt script - Slicer3Version.txt.in is
now configured and installed in to Slicer_HOME/lib/Slicer3 at build time.

The following variable are discovered at build time:
 Slicer3_BUILD         -> Computed using CMake/DiscoverSystemNameAndBits.cmake
 Slicer3_BUILDDATE     -> Computed using macro TODAY from CMake/Slicer3TodayMacro.cmake
 Slicer3_WC_URL        -> Computed using either macro Subversion_WC_INFO (if slicer checkout using svn)
                          or Git_WC_INFO (if slicer is checkout using git-svn)
 Slicer3_WC_REVISION   -> idem

Revision 11644 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 14 22:04:20 2010 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 21565 byte(s)
Diff to previous 11639
ENH: Adding convenience Script to run an Experimental build using off-screen rendering.


Revision 11639 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 14 19:23:50 2010 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 21409 byte(s)
Diff to previous 11580
ENH: Adding helper script for computing code coverage locally, by using lcov.


Revision 11580 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 9 01:04:31 2010 UTC (7 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 21247 byte(s)
Diff to previous 11547
COMP: Add WARNING_EXCEPTION rules to CTestCustom.cmake.in

The added rules will prevent itk, vtk and qt warnings to show up.

Revision 11547 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 7 17:21:27 2010 UTC (7 years, 9 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 21160 byte(s)
Diff to previous 11508
ENH: SlicerQT - Add Designer launcher configuration to a separate folder: Slicer3/Utilities/Designer

Revision 11508 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 4 19:10:35 2010 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 20968 byte(s)
Diff to previous 11506
ENH: Removing .NoDartCoverage files and replacing them with the
     CTEST_CUSTOM_COVERAGE_EXCLUDE variable in the CTestCustom.cmake.in file.



Revision 11506 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 4 18:00:59 2010 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 21480 byte(s)
Diff to previous 11391
ENH: Moving the runValgrind.sh script file to the Scripts directory, to avoid cluttering the top directory of Slicer3.


Revision 11391 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 26 21:43:51 2009 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 21464 byte(s)
Diff to previous 11387
ENH: Removing .NoDartCoverage file from the top directory of the binary tree.


Revision 11387 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 26 17:01:54 2009 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 21520 byte(s)
Diff to previous 11386
ENH: Copying .NoDartCoverage files to the binary directories where
     .cxx files are generated for code coverage. In this way those
     direcgtories will be excluded from the code coverage computation.


Revision 11386 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 26 16:52:26 2009 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 20951 byte(s)
Diff to previous 11383
ENH: Adding script for running Valgrind. 
     The script is configured and copied to the binary directory Slicer3-build.


Revision 11383 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 26 16:43:57 2009 UTC (7 years, 9 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 20836 byte(s)
Diff to previous 11296
ENH: Moving TestingMacros.h to the top directoy in order to make it available to other Testing subdirectories.
     Also adding a TEST_SET_GET_STRING() macro to perform extensive testing in Set/Get String methods.


Revision 11296 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 15 09:02:21 2009 UTC (7 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 20798 byte(s)
Diff to previous 11295
COMP: Since VTK_WRAP_TCL already defined in vtkToolkits.h, removed corresponding ADD_DEFINITIONS(-DVTK_WRAP_TCL) from CMakeLists.txt

Revision 11295 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 15 09:02:18 2009 UTC (7 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 20953 byte(s)
Diff to previous 11274
COMP: Update main CMakeLists.txt to include TCL/KWWidgets code only if required.

Three different sets of parameters are now available:
  1) Slicer3_USE_KWIDGETS:ON (default)  and  Slicer3_USE_QT:OFF (default)
  2) Slicer3_USE_KWIDGETS:ON (default)  and  Slicer3_USE_QT:ON
  3) Slicer3_USE_KWIDGETS:OFF (default)  and  Slicer3_USE_QT:ON


   - if Slicer3_USE_KWIDGETS is OFF
         * Unset the Slicer3_INSTALL_MODULES_* variables
         * Exclude FIND_PACKAGE(KWWidgets REQUIRED)
   - if Slicer3_USE_KWIDGETS is ON
         * SKIP_KWWidgets_BUILD_SETTINGS_FILE set to 1
         * ADD_DEFINITIONS(-DSlicer3_USE_KWWIDGETS)
   - Complain if both Slicer3_USE_QT and Slicer3_USE_KWWIDGETS are OFF
   - Complain if Slicer3_USE_QT is ON, Slicer3_USE_KWWIDGETS is OFF and if VTK_WRAP_TCL is ON
   - All TCL specific code is included only if VTK_WRAP_TCL is ON

Revision 11274 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 14 19:14:57 2009 UTC (7 years, 10 months ago) by ibanez
Original Path: trunk/CMakeLists.txt
File length: 17466 byte(s)
Diff to previous 11209
ENH: Fixing configuration for Testing, adding CXX_TEST_PATH variable in the top CMakeLists.txt file, to indicate where the executables of tests should go.


Revision 11209 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 8 04:15:18 2009 UTC (7 years, 10 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 17411 byte(s)
Diff to previous 10843
ENH: Update CMakeLists.txt - CMake 2.6 is now required

The following line have been added:

CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
IF(COMMAND CMAKE_POLICY)
  CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)

Revision 10843 - (view) (download) (annotate) - [select for diffs]
Modified Mon Nov 2 15:38:46 2009 UTC (7 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 17410 byte(s)
Diff to previous 10807
BUG: QtSlicer - Remove macro qSlicerGetModuleTitleDefinitionMacro/qSlicerGetModuleTitleDeclrationMacro and add the virtual method moduleTitle. In vtkSlicerApplication, rename method InitializeQtModule to InitializeQtCoreModule and add method InitializeQtCoreModules. Update QTModules and add the QtPlugin declaration. Update the appropriate header and cmake files in order to install the Qt loadable modules into a separate directory named 'QTLoadableModules'

Revision 10807 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 30 14:56:49 2009 UTC (7 years, 11 months ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 16694 byte(s)
Diff to previous 10734
ENH: QtSlicer - Add directory structure (and corresponding CMake file) containing loadable Qt Modules.

Revision 10734 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 22 20:19:32 2009 UTC (8 years ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 16879 byte(s)
Diff to previous 10581
COMP: suppress microsoft build warnings

Revision 10581 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 7 11:47:33 2009 UTC (8 years ago) by jcfr
Original Path: trunk/CMakeLists.txt
File length: 16231 byte(s)
Diff to previous 10426
ENH: Initial commit of the QtSlicer port. Added subdirs Base/GUI2, Libs/QCTKWidgets and Libs/QMRMLWidgets. Updated Application/GUI/Slicer3 and Base/GUI/vtkSlicerApplication to be able to initialize and start QtModule. CMakeLists.txt also updated to consider the script CMake/Slicer3FindQT.cmake

Revision 10426 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 8 20:52:14 2009 UTC (8 years, 1 month ago) by hjohnson
Original Path: trunk/CMakeLists.txt
File length: 15795 byte(s)
Diff to previous 10316
COMP: With the conversion to CMake version 2.6, the variables CMAKE_RUNTIME_OUTPUT_DIRECTORY CMAKE_LIBRARY_OUTPUT_DIRECTORY CMAKE_ARCHIVE_OUTPUT_DIRECTORY should be used instead of EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH.

Revision 10316 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 20 15:02:03 2009 UTC (8 years, 2 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 15733 byte(s)
Diff to previous 10300
COMP: move QT include command in front of first use

Revision 10300 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 18 21:41:06 2009 UTC (8 years, 2 months ago) by alexy
Original Path: trunk/CMakeLists.txt
File length: 15733 byte(s)
Diff to previous 10267
ENH: Qt support

Revision 10267 - (view) (download) (annotate) - [select for diffs]
Modified Sun Aug 16 16:14:50 2009 UTC (8 years, 2 months ago) by domibel
Original Path: trunk/CMakeLists.txt
File length: 15276 byte(s)
Diff to previous 10066
ENH: Version numbering for shared libraries

Revision 10066 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 28 16:53:22 2009 UTC (8 years, 2 months ago) by hayes
Original Path: trunk/CMakeLists.txt
File length: 14832 byte(s)
Diff to previous 10065
BUG: curly brace typo

Revision 10065 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 28 16:43:08 2009 UTC (8 years, 2 months ago) by hayes
Original Path: trunk/CMakeLists.txt
File length: 14832 byte(s)
Diff to previous 9286
ENH: packaging for Slicer3Version.txt

Revision 9286 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 22 23:08:07 2009 UTC (8 years, 6 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 14777 byte(s)
Diff to previous 7835
COMP: bump the version number for the experimental builds

Revision 7835 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 11 15:43:01 2008 UTC (8 years, 11 months ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 14777 byte(s)
Diff to previous 7799
ENH: Added CMake option for using OpenIGTLink library.

Revision 7799 - (view) (download) (annotate) - [select for diffs]
Modified Wed Nov 5 23:39:51 2008 UTC (8 years, 11 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 15395 byte(s)
Diff to previous 7616
COMP: change from TEEM to Teem for compatibility with current svn trunk of teem

Revision 7616 - (view) (download) (annotate) - [select for diffs]
Modified Sat Sep 27 19:45:49 2008 UTC (9 years ago) by lorensen
Original Path: trunk/CMakeLists.txt
File length: 15395 byte(s)
Diff to previous 7223
ENH: the start of ctest scripts for building Slicer3/

Revision 7223 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 27 16:16:32 2008 UTC (9 years, 3 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 15106 byte(s)
Diff to previous 6951
ENH: fix submission to dashboard for plugins

Revision 6951 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 30 22:37:03 2008 UTC (9 years, 4 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 14919 byte(s)
Diff to previous 6921
ENH: change version numbers to 3.3 alpha

Revision 6921 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 29 19:25:51 2008 UTC (9 years, 4 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 14919 byte(s)
Diff to previous 6860
ENH: fix ordering

Revision 6860 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 26 15:35:35 2008 UTC (9 years, 4 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 14918 byte(s)
Diff to previous 6807
ENH: important workaround to allow people to use an installed Slicer3 to build modules, even with a different generator or a compiler installed at a different location; it still has to be the same compiler version. Win32.

Revision 6807 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 22 04:47:43 2008 UTC (9 years, 5 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 13899 byte(s)
Diff to previous 6803
ENH: actually a little trickier. Do not put Find(Slicerlibcurl) in Modules/, since this whole subdir can be built independently. Put it in the top dir. Building against an installed Slicer3 should not bring the slicerlibcurl dependency anyway since it was built STATIC, the problem seems to be for modules built from the source tree directly, not external modules. I'd rather not pollute Modules/CMakeLists.txt

Revision 6803 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 21 23:25:36 2008 UTC (9 years, 5 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 13755 byte(s)
Diff to previous 6777
ENH: make sure all sub-project in Libs/ can be built in a standalone fashion (remove 99% of the refs to Slicer3, macros, etc). Make sure all external toolkits are properly included, and fix some issues in MRML with respect to TEEM/vtkTeem.

Revision 6777 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 20 07:33:10 2008 UTC (9 years, 5 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 13756 byte(s)
Diff to previous 6583
ENH: Slicer3 Spring Installation Clean Up

Revision 6583 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 30 19:16:15 2008 UTC (9 years, 5 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 10048 byte(s)
Diff to previous 6570
ENH: update for CMake 2.6

Revision 6570 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 29 03:05:32 2008 UTC (9 years, 5 months ago) by tgl
Original Path: trunk/CMakeLists.txt
File length: 9962 byte(s)
Diff to previous 6552
ENH results of merge with 6049:6469 from branches/tgl_loadable_modules.  Adds GenerateLM to create entry points for loadable module support via a text file and CMake macro. WFEngine, NeuroNav, Qdec and GAD are setup, other modules have text files, but the macro in the CMakeLists file is commented out.  Updated Slicer3_main,  the modules above will only be loaded if the DLL is found at run-time.  Lastly made a change to vtkSlicerViewerWidget, check for a NULL ModelHierarchyLogic pointer before continuing, which might not be the right thing to do.

Revision 6552 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 25 22:27:26 2008 UTC (9 years, 5 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 9838 byte(s)
Diff to previous 5732
ENH: allow a module (Modules/GradientAnisotropicDiffusionFilter for now) to be built in a standalone fashion against eithera Slicer3 build or Slicer3 installed. Update the config files accordingly, add missing installation rules, etc. Also unscreamify and indent many CMakeLists.txt in the process.

Revision 5732 - (view) (download) (annotate) - [select for diffs]
Modified Wed Feb 6 22:34:12 2008 UTC (9 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 8340 byte(s)
Diff to previous 5614
BUG: fix discovery of command line modules in test by specifying that the slicer launcher should be used to set up the environment before running the test

Revision 5614 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 25 22:48:24 2008 UTC (9 years, 8 months ago) by millerjv
Original Path: trunk/CMakeLists.txt
File length: 8285 byte(s)
Diff to previous 5576
ENH: more changes to Slicer, GenerateCLP, ModuleDescriptionParser, and TCLAP to support building command line modules against an installation.  This currently works with a CVSHEAD ITK. Remaining configuration changes are to install .lib's under <install>/lib/Slicer3 instead of under <install>/lib.  This will make all the packages consistent in how they navigate from where the <Pkg>Config.cmake lives in the installation to the directories for libs, includes, etc.

Revision 5576 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jan 23 15:07:17 2008 UTC (9 years, 9 months ago) by millerjv
Original Path: trunk/CMakeLists.txt
File length: 8277 byte(s)
Diff to previous 5494
ENH: More changes to the configurations of GenerateCLP to streamline its use and installation. Thanks to Hans Johnson for working through many of these issues.

Revision 5494 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 14 18:21:21 2008 UTC (9 years, 9 months ago) by millerjv
Original Path: trunk/CMakeLists.txt
File length: 8151 byte(s)
Diff to previous 5052
BUG: remove message about VTKMacros from build script.

Revision 5052 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 5 18:12:21 2007 UTC (9 years, 10 months ago) by davisb
Original Path: trunk/CMakeLists.txt
File length: 8152 byte(s)
Diff to previous 4929
ENH: add CTestCustom.cmake.in so that ctest vars can be customized

Revision 4929 - (view) (download) (annotate) - [select for diffs]
Modified Sun Nov 25 21:23:07 2007 UTC (9 years, 10 months ago) by millerjv
Original Path: trunk/CMakeLists.txt
File length: 8002 byte(s)
Diff to previous 4729
ENH: More configuration changes to support building plugins from a Slicer3 installation (still not complete)

Revision 4729 - (view) (download) (annotate) - [select for diffs]
Modified Sun Oct 28 16:52:20 2007 UTC (9 years, 11 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 7512 byte(s)
Diff to previous 4709
COMP: fix for linker bug in Mac OS 10.5

Revision 4709 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 25 20:07:16 2007 UTC (9 years, 11 months ago) by nobyhata
Original Path: trunk/CMakeLists.txt
File length: 6949 byte(s)
Diff to previous 4656
ENH: IGSTK has been turned back to OFF per discussion in the mailing list on Oct 26.

Revision 4656 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 17 04:29:25 2007 UTC (10 years ago) by nobyhata
Original Path: trunk/CMakeLists.txt
File length: 6948 byte(s)
Diff to previous 4346
ENH: Default CmakeList.txt now has IGSTK ON

Revision 4346 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 17 16:03:48 2007 UTC (10 years, 1 month ago) by aylward
Original Path: trunk/CMakeLists.txt
File length: 6949 byte(s)
Diff to previous 4342
ENH: Default to off for non-getbuildtest2 builds



Revision 4342 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 17 15:35:57 2007 UTC (10 years, 1 month ago) by aylward
Original Path: trunk/CMakeLists.txt
File length: 6947 byte(s)
Diff to previous 4306
ENH: Direct access to tutorials from within Slicer3



Revision 4306 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 11 21:42:41 2007 UTC (10 years, 1 month ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 6662 byte(s)
Diff to previous 4253
ENH: a) fix the (usual) missing _DEBUG statement around some modules init/uninit/run, etc. b) allow for a more lightweight Slicer3. Default Slicer3 in debug/win32 is 2.5 GB! Turn BUILD_CLI to OFF to disable CLI plugins, Slicer3 is now 700 MB. Turn BUILD_MODULES to OFF to disable all modules together, Slicer3 is now down to 500 MB, compiles, links and launchs much faster, good for debugging and small hard drives (think SSD).

Revision 4253 - (view) (download) (annotate) - [select for diffs]
Modified Wed Sep 5 18:18:40 2007 UTC (10 years, 1 month ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 6460 byte(s)
Diff to previous 4139
BUG: changed NAVITRACK_BINARY_DIR to NAVITRACK_LIB_DIR.

Revision 4139 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 28 13:21:52 2007 UTC (10 years, 1 month ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6463 byte(s)
Diff to previous 4077
COMP: remove USE_TEEM defines from various parts of the code and cmake files - teem is now required

Revision 4077 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 16 15:02:07 2007 UTC (10 years, 2 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6463 byte(s)
Diff to previous 3765
COMP: fix link problem on mac for navitrack

Revision 3765 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 29 15:51:59 2007 UTC (10 years, 3 months ago) by blezek
Original Path: trunk/CMakeLists.txt
File length: 6460 byte(s)
Diff to previous 3490
ENH: Extended ModuleFactory to search for Python modules
CommandLine module Logic will execute the Python module inside the Slicer executable in a separate thread from the GUI.
This is an initial implementation, and is essentially a strawman for how Python Modules will be integrated into Slicer.  In particular, the XML support will be agumented to properly cast strings passed to Python from Slicer into proper Python objects/datatypes.


Revision 3490 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 5 23:39:56 2007 UTC (10 years, 4 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6427 byte(s)
Diff to previous 3482
COMP: turn off navitrack by default (applies to builds that do not use getbuildtest)

Revision 3482 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 5 16:40:32 2007 UTC (10 years, 4 months ago) by rsierra
Original Path: trunk/CMakeLists.txt
File length: 6426 byte(s)
Diff to previous 3302
ENH: added a version of reslice with a mask and re-arranged the rendering pipeline to improve performance

Revision 3302 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 1 14:35:20 2007 UTC (10 years, 5 months ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 6427 byte(s)
Diff to previous 3030
ENH: replaced OpenTracker with NaviTrack.

Revision 3030 - (view) (download) (annotate) - [select for diffs]
Modified Mon Mar 26 20:15:37 2007 UTC (10 years, 6 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6806 byte(s)
Diff to previous 3003
BUG: make sure the installed version of the file ends up in the right place (a subdirectory named launch.tcl was being created)

Revision 3003 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 22 15:24:24 2007 UTC (10 years, 7 months ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 6817 byte(s)
Diff to previous 2984
ENH: added support for IGSTK.

Revision 2984 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 20 22:19:12 2007 UTC (10 years, 7 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6605 byte(s)
Diff to previous 2983
BUG: fixed syntax for install

Revision 2983 - (view) (download) (annotate) - [select for diffs]
Modified Tue Mar 20 20:52:29 2007 UTC (10 years, 7 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6599 byte(s)
Diff to previous 2939
ENH: add the launcher file to cpack

Revision 2939 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 15 15:53:54 2007 UTC (10 years, 7 months ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 6519 byte(s)
Diff to previous 2938
BUG: put a switch between opentracker 1.3 and 2.0.

Revision 2938 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 15 15:36:18 2007 UTC (10 years, 7 months ago) by rsierra
Original Path: trunk/CMakeLists.txt
File length: 6262 byte(s)
Diff to previous 2523
COMP: Moved from OpenTracker to NaviTrack library

Revision 2523 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 9 16:44:44 2007 UTC (10 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6203 byte(s)
Diff to previous 2390
ENH: new launcher mechanism based on tclkit (same as slicer2) to provide fast feedback to users during launch process

Revision 2390 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 30 17:53:35 2007 UTC (10 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 6156 byte(s)
Diff to previous 2325
ENH: initial support for the starkit-based launcher

Revision 2325 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 25 19:37:49 2007 UTC (10 years, 8 months ago) by millerjv
Original Path: trunk/CMakeLists.txt
File length: 6056 byte(s)
Diff to previous 2015
ENH: Turned off the warnings from Visual Studio 2005 wrt sprintf, strcpy, etc.
ENH: Added logic to search for python

Revision 2015 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 4 09:00:55 2007 UTC (10 years, 9 months ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 5705 byte(s)
Diff to previous 1883
COMP: Mac is picky about Versions not being integers

Revision 1883 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 19 20:39:34 2006 UTC (10 years, 10 months ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 5711 byte(s)
Diff to previous 1836
ENH: used OpenTracker 2.0.

Revision 1836 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 14 19:56:12 2006 UTC (10 years, 10 months ago) by hliu
Original Path: trunk/CMakeLists.txt
File length: 5699 byte(s)
Diff to previous 1829
ENH: added opentracker support.

Revision 1829 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 14 14:18:56 2006 UTC (10 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5034 byte(s)
Diff to previous 1827
ENH: move the teem detection code to the same spot as other FIND_PACKAGE calls, and before the place where the TEEM_DIR is used to make the launcher

Revision 1827 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 14 01:19:17 2006 UTC (10 years, 10 months ago) by millerjv
Original Path: trunk/CMakeLists.txt
File length: 5029 byte(s)
Diff to previous 1795
BUG: TEEM support was pretty standard.  Replaced suspect CMake code with standard CMake code to find and load teem.

Revision 1795 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 12 15:16:09 2006 UTC (10 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5320 byte(s)
Diff to previous 1794
ENH: turn teem off by default

Revision 1794 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 12 15:13:14 2006 UTC (10 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5319 byte(s)
Diff to previous 1793
ENH: make teem optional

Revision 1793 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 12 14:35:47 2006 UTC (10 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5177 byte(s)
Diff to previous 1791
BUG: needed to support TEEM in launcers (thanks Seb!)

Revision 1791 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 12 13:10:05 2006 UTC (10 years, 10 months ago) by lorensen
Original Path: trunk/CMakeLists.txt
File length: 5156 byte(s)
Diff to previous 1785
BUG: teem was not configured properly.


Revision 1785 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 11 23:32:54 2006 UTC (10 years, 10 months ago) by rjosest
Original Path: trunk/CMakeLists.txt
File length: 5125 byte(s)
Diff to previous 1724
ENH: Added variables to link against Teem. There is a new dependency in Libs/vtkTeem to Teem

Revision 1724 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 30 22:27:28 2006 UTC (10 years, 10 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 4853 byte(s)
Diff to previous 1684
ENH: added helper text to license file and changed version number to include 'alpha' and added license pointer to cpack infoLicense.txt

Revision 1684 - (view) (download) (annotate) - [select for diffs]
Modified Sun Nov 26 19:55:49 2006 UTC (10 years, 10 months ago) by lorensen
Original Path: trunk/CMakeLists.txt
File length: 4847 byte(s)
Diff to previous 1427
ENH: Libs contains packages.

Revision 1427 - (view) (download) (annotate) - [select for diffs]
Modified Fri Oct 6 15:13:47 2006 UTC (11 years ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 4547 byte(s)
Diff to previous 1277
ENH: add patch tag options so builds can be tagged with date stamps

Revision 1277 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 19 19:15:50 2006 UTC (11 years, 1 month ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 4482 byte(s)
Diff to previous 1268
ENH: Move packaging into a subdirectory and start working on supporting tcl installing

Revision 1268 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 18 18:53:22 2006 UTC (11 years, 1 month ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 5873 byte(s)
Diff to previous 1267
ENH: More cleanups and putting things to the right place (on the top of the other things)

Revision 1267 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 18 17:33:48 2006 UTC (11 years, 1 month ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 5764 byte(s)
Diff to previous 1263
ENH: Move the location of some libraries and fix installation

Revision 1263 - (view) (download) (annotate) - [select for diffs]
Modified Fri Sep 15 21:23:43 2006 UTC (11 years, 1 month ago) by hayes
Original Path: trunk/CMakeLists.txt
File length: 5566 byte(s)
Diff to previous 1258
BUG: Commented out broken lines

Revision 1258 - (view) (download) (annotate) - [select for diffs]
Modified Fri Sep 15 20:14:33 2006 UTC (11 years, 1 month ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 5562 byte(s)
Diff to previous 1087
ENH: First stab at packaging on Linux

Revision 1087 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 22 16:35:51 2006 UTC (11 years, 2 months ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 5318 byte(s)
Diff to previous 908
ENH: Initial import of doxygen

Revision 908 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 19 13:05:27 2006 UTC (11 years, 3 months ago) by lorensen
Original Path: trunk/CMakeLists.txt
File length: 5176 byte(s)
Diff to previous 899
BUG: Removed KWWidgets version testing until it works.


Revision 899 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 17 18:07:18 2006 UTC (11 years, 3 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5588 byte(s)
Diff to previous 897
COMP: check the vtk version to ensure compatibility

Revision 897 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 17 16:05:52 2006 UTC (11 years, 3 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5575 byte(s)
Diff to previous 896
COMP: back out vtk check

Revision 896 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 17 16:03:35 2006 UTC (11 years, 3 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 5545 byte(s)
Diff to previous 869
COMP: add mechanism for checking vtk version.  Keep version number set to VTK-5-0 for now

Revision 869 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 12 16:56:34 2006 UTC (11 years, 3 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 4874 byte(s)
Diff to previous 327
COMP: added check for KWWidgets version

Revision 327 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 24 17:04:35 2006 UTC (11 years, 6 months ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 4474 byte(s)
Diff to previous 309
ENH: Require CMake 2.2

Revision 309 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 21 18:37:16 2006 UTC (11 years, 6 months ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 4474 byte(s)
Diff to previous 300
ENH: Cleanup

Revision 300 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 20 20:04:53 2006 UTC (11 years, 6 months ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 4473 byte(s)
Diff to previous 286
ENH: Add support for the dashboard

Revision 286 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 18:32:27 2006 UTC (11 years, 6 months ago) by andy
Original Path: trunk/CMakeLists.txt
File length: 4501 byte(s)
Diff to previous 89
ENH: Start integrating packaging code

Revision 89 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 24 23:54:43 2006 UTC (11 years, 7 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 2845 byte(s)
Diff to previous 86
ENH: macro name changed

Revision 86 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 24 04:22:57 2006 UTC (11 years, 7 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 2845 byte(s)
Diff to previous 76
ENH: as much as LIBRARY_OUTPUT_PATH should be lib/, it's kind of traditional to set it to bin/ otherwise Windows can't find the DLL associated to an executable.

Revision 76 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 23 02:52:53 2006 UTC (11 years, 8 months ago) by barre
Original Path: trunk/CMakeLists.txt
File length: 2845 byte(s)
Diff to previous 67
ENH: make sure it compiles for Win32

Revision 67 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 21 22:50:47 2006 UTC (11 years, 8 months ago) by malaterre
Original Path: trunk/CMakeLists.txt
File length: 2170 byte(s)
Diff to previous 33
ENH: Add option to build shared/static

Revision 33 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 14 17:39:14 2006 UTC (11 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 1992 byte(s)
Diff to previous 10
COMP: Initial checkins of build structure plus edits to make some things build

Revision 10 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 7 22:01:24 2006 UTC (11 years, 8 months ago) by malaterre
Original Path: trunk/CMakeLists.txt
File length: 1833 byte(s)
Diff to previous 9
ENH: Some minor tweaks. Only exposed on option: BUILD_TESTING. the Slicer3 one will be the one used

Revision 9 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 7 21:52:34 2006 UTC (11 years, 8 months ago) by malaterre
Original Path: trunk/CMakeLists.txt
File length: 1351 byte(s)
Diff to previous 7
ENH: Mark as advanced unused Dart var

Revision 7 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 7 20:39:04 2006 UTC (11 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 1309 byte(s)
Diff to previous 5
ENH: Added ITK and KWWidgets (VTK) to build

Revision 5 - (view) (download) (annotate) - [select for diffs]
Added Tue Jan 31 16:59:11 2006 UTC (11 years, 8 months ago) by pieper
Original Path: trunk/CMakeLists.txt
File length: 739 byte(s)
COMP: initial cut at cmake files

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

An Exception Has Occurred

Python Traceback

Traceback (most recent call last):
  File &quot;/usr/lib/viewvc/lib/viewvc.py&quot;, line 4844, in main
    request.run_viewvc()
  File &quot;/usr/lib/viewvc/lib/viewvc.py&quot;, line 402, in run_viewvc
    self.view_func(self)
  File &quot;/usr/lib/viewvc/lib/viewvc.py&quot;, line 2950, in view_log
    generate_page(request, &quot;log&quot;, data)
  File &quot;/usr/lib/viewvc/lib/viewvc.py&quot;, line 944, in generate_page
    template.generate(server_fp, data)
  File &quot;/usr/lib/viewvc/lib/ezt.py&quot;, line 329, in generate
    self._execute(self.program, ctx)
  File &quot;/usr/lib/viewvc/lib/ezt.py&quot;, line 458, in _execute
    step[0](step[1], ctx)
  File &quot;/usr/lib/viewvc/lib/ezt.py&quot;, line 466, in _cmd_print
    raise Exception(&quot;Unprintable value type for '%s'&quot; % (str(valrefs[0][0])))
Exception: Unprintable value type for 'logsort_hidden_values'