Changesets: Import 2017-06-07 23:51:09

Search Browse Back to Index

master 62d9181e

2014-01-20 15:54:44

jcfr

Details Diff 		COMP: DashboardDriver: Introduce SVN_REPOSITORY variable

By default the variable is set to:

http://svn.slicer.org/${CTEST_PROJECT_NAME}

If needed, the variable SVN_REPOSITORY can also be set prior to include
the driver script.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22842 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerDashboardDriverScript.cmake Diff File

master f454709a

2014-01-20 15:42:06

jcfr

Details Diff 		COMP: DashboardDriver: Expect MIDAS_PACKAGE_URL if packaging is enabled

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22841 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/SlicerDashboardDriverScript.cmake Diff File

master 37206b5e

2014-01-19 10:19:43

jcfr

Details Diff 		STYLE: In reloadScriptedModule - Use 'with' statement to open file

See http://freepythontips.wordpress.com/2014/01/15/the-open-function-explained/

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22840 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/Python/slicer/util.py Diff File

master d594f015

2014-01-19 02:59:22

jcfr

Details Diff 		ENH: Factor out scripted module reload function into 'slicer.util'

At least two versions of the code were used to reload a scripted module
were existing. This commit add the most recent version into
the function 'slicer.util.reloadScriptedModule' and update the
Slicer modules to use it.

Note that since not all module implements the 'cleanup' function,
an additional test has been added to check if the method is available.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22839 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Applications/SlicerApp/Testing/Python/AtlasTests.py Diff File
mod - Applications/SlicerApp/Testing/Python/Charting.py Diff File
mod - Applications/SlicerApp/Testing/Python/FiducialLayoutSwitchBug1914.py Diff File
mod - Applications/SlicerApp/Testing/Python/JRC2013Vis.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNA2012ProstateDemo.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNAQuantTutorial.py Diff File
mod - Applications/SlicerApp/Testing/Python/RSNAVisTutorial.py Diff File
mod - Applications/SlicerApp/Testing/Python/ScenePerformance.py Diff File
mod - Applications/SlicerApp/Testing/Python/SliceLinkLogic.py Diff File
mod - Applications/SlicerApp/Testing/Python/Slicer4Minute.py Diff File
mod - Applications/SlicerApp/Testing/Python/ViewControllersSliceInterpolationBug1926.py Diff File
mod - Applications/SlicerApp/Testing/Python/fiber_visibility_crash2438.py Diff File
mod - Applications/SlicerApp/Testing/Python/labelToggleBug2049.py Diff File
mod - Applications/SlicerApp/Testing/Python/sceneImport2428.py Diff File
mod - Applications/SlicerApp/Testing/Python/slicerCloseCrashBug2590.py Diff File
mod - Applications/SlicerApp/Testing/Python/test_tractography_display.py Diff File
mod - Base/Python/slicer/util.py Diff File
mod - Extensions/Testing/ScriptedLoadableExtensionTemplate/ScriptedLoadableModuleTemplate/ScriptedLoadableModuleTemplate.py Diff File
mod - Modules/Loadable/CropVolume/Testing/Python/CropVolumeSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/AddManyMarkupsFiducialTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/MarkupsInCompareViewersSelfTest.py Diff File
mod - Modules/Loadable/Markups/Testing/Python/NeurosurgicalPlanningTutorialMarkupsSelfTest.py Diff File
mod - Modules/Loadable/VolumeRendering/Testing/Python/VolumeRenderingSceneClose.py Diff File
mod - Modules/Scripted/DataProbe/DataProbe.py Diff File
mod - Modules/Scripted/SurfaceToolbox/SurfaceToolbox.py Diff File

master 38905c90

2014-01-19 00:13:42

jcfr

Details Diff 		COMP: Fix VTK external project to work correctly with Ninja generator

Use the variable 'CMAKE_MAKE_PROGRAM' instead of the undocumented variable
MAKECOMMAND.

For more details referers to CMake commits kitware/CMake@4ac75fdf [1] and
kitware/CMake@4cce44b [2]

This is know to work with:
- Ninja 1.4.0
- CMake 2.8.12.1

[1] http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ac75fdf
[2] http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cce44b

The error was:

// ---------------
FAILED: cd /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK-build && /home/jchris/Support/cmake-2.8.11.2/bin/cmake -DMAKE_COMMAND= -P /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK_build_step.cmake && /home/jchris/Support/cmake-2.8.11.2/bin/cmake -E touch /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK-prefix/src/VTK-stamp/VTK-build
CMake Error at /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build/VTK_build_step.cmake:5 (message):
error: MAKE_COMMAND is not set !
// ---------------

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22838 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_VTK.cmake Diff File

master c35c46d3

2014-01-18 23:48:59

jcfr

Details Diff 		COMP: Fix 'ninja' build error specifying 'make' command to build OpenSSL.

Since OpenSSL build system doesn't provide ninja files, it is important
to explicitly specify that it should be built using ninja.

Error was the following:

[7/9] Performing build step for 'Slicer'
FAILED: cd /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build && /home/jchris/Support/cmake-2.8.11.2/bin/cmake --build /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/Slicer-build --config . && /home/jchris/Support/cmake-2.8.11.2/bin/cmake -E touch /home/jchris/Projects/SarrpTPS-SuperBuild-Release-Qt485-N/CMake/Superbuild/Slicer-cmake/src/Slicer-stamp/Slicer-build
ninja: error: build.ninja:726: bad $-escape (literal $ must be written as $$)

ninja: build stopped: subcommand failed.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22837 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_OpenSSL.cmake Diff File

master 6ff4314a

2014-01-18 23:02:59

jcfr

Details Diff 		COMP: Build test CLIs only if BUILD_TESTING is ON

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22836 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/CLI/CMakeLists.txt Diff File

master b815267d

2014-01-18 13:24:45

fedorov

Details Diff 		ENH: use a sort procedure based on numbers instead of alphanumeric. Fixes issue
3487. Fix contributed by Yanlling Liu.


git-svn-id: http://svn.slicer.org/Slicer4/trunk@22835 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild.cmake Diff File

master 997d5eb3

2014-01-17 18:00:28

jcfr

Details Diff 		COMP: Fix parallel build associating patch step with "python-source" project

It is not clear why associating the PATCH_COMMAND with the python
project caused issue when doing parallel build using Ninja on Windows.
The patch step was executed before the download of python could finish.

This commit "resolves" the problem by associated the patch command
with the python source project.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22834 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File

master 8244dd11

2014-01-17 15:57:24

jcfr

Details Diff 		COMP: Tweak python external project to use CMAKE_CFG_INTDIR only when needed

This commit doesn't change the outcome of the current build process. It
simply re-organize the code to minimize confusion.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22833 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File

master c4f62fd4

2014-01-17 15:57:21

jcfr

Details Diff 		COMP: Ensure OpenSSL libs can be referenced with single-config generator

When building Slicer on windows, the OpenSSL libraries are
available for both Debug and Release in a single package.

This commit ensure that the library can also be referenced when building
on windows in the case a single config CMake generator like Ninja is used.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22832 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_OpenSSL.cmake Diff File

master 60d3dbe8

2014-01-17 10:53:02

jcfr

Details Diff 		COMP: Python ExternalProject - Fix configure warnings, consistent symlinks

$ git shortlog 892c95b5..82e1494
Jean-Christophe Fillion-Robin (3):
Merge branch '26-create-installed-python-executable-symlinks'
Escape double-quote in ConfigureChecks to fix CMake 2.8.12.1 warnings.
Merge branch '32-fix-cmake2.8.12.1-configure-warning'

Will Dicharry (1):
Create versioned symlinks on install to match autoconf python install.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22831 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File

master 4f826091

2014-01-17 10:22:56

jcfr

Details Diff 		COMP: Use PATCH_COMMAND to set python project patch step

Using PATCH_STEP was preventing python from being configured, using
PATCH_COMMAND is the only documented way of associating a patch step with
an external project.

See http://www.cmake.org/cmake/help/v2.8.12/cmake.html#module:ExternalProject

See 0003158

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22830 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File

master ffcfd7cd

2014-01-17 02:32:31

jcfr

Details Diff 		COMP: Specify python patch step only if MSVC variable is True

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22829 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File

master 98ce8bcc

2014-01-17 02:32:28

jcfr

Details Diff 		COMP: Properly pass parameter to python_patch.cmake

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22828 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File
mod - SuperBuild/python_patch.cmake Diff File

master 8c0c90dc

2014-01-17 01:43:19

jcfr

Details Diff 		COMP: 0003158 fix NUMPY build on Visual Studio 2010/2012

Patch Python distutils to avoid using a manifest as
discussed here:

http://mail.scipy.org/pipermail/numpy-discussion/2012-November/064488.html

From: Isaiah Norton <inorton@bwh.harvard.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22827 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_python.cmake Diff File
add - SuperBuild/python_patch.cmake Diff File

master 5177aa3e

2014-01-17 00:18:48

jcfr

Details Diff 		COMP: Fix typo introduced in previous commit

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22826 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/CMakeLists.txt Diff File

master 1f5e5cbc

2014-01-17 00:13:37

jcfr

Details Diff 		COMP: Associate FiberBundleToLabelMap module with BUILD_DIFFUSION_SUPPORT

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22825 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/CMakeLists.txt Diff File

master 57dabfd6

2014-01-16 19:07:20

jcfr

Details Diff 		COMP: Update ExternalProjectDependency based on commontk/Artichoke@da5367b

$ git shortlog 243982e..da5367b
Jean-Christophe Fillion-Robin (1):
Fix typo preventing additional external project from being considered

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22824 3bd1e089-480b-0410-8dfb-8563597acbee
mod - CMake/ExternalProjectDependency.cmake Diff File

master b3a442ec

2014-01-14 18:10:56

pieper

Details Diff 		BUG: avoid spurious warnings from DataProbe during startup

Make sure the frame member of the widget is set before
setting up observers to avoid a situation where the processEvents
is called before setup is complete. This avoids some spurious
warning messages during startup.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22823 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/DataProbe/DataProbe.py Diff File

master adf97a4c

2014-01-14 14:45:40

jcfr

Details Diff 		COMP: Fix configuration of Slicer against system python

When building against system python, the pydicom module won't be
installed at configure/build time.

A Slicer runtime test could be added to check if expected python module
are available.

Thanks to "Dominique Belhachemi <domibel@debian.org>" for reporting the
problem.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22822 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_pydicom.cmake Diff File

master c9eb2585

2014-01-14 14:24:28

jcfr

Details Diff 		COMP: Revert - vtkPichonFastMarching - Replace finite() with isfinite()"

This reverts commit r22819

isfinite() function is not available on windows 2008:

20>47>..\..\..\..\..\..\Slicer4\Modules\Scripted\EditorLib\Logic\vtkPichonFastMarchingPDF.cxx(193) : error C3861: 'isfinite': identifier not found

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22821 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/Logic/vtkPichonFastMarching.cxx Diff File
mod - Modules/Scripted/EditorLib/Logic/vtkPichonFastMarchingPDF.cxx Diff File

master a6f420a2

2014-01-14 13:58:25

jcfr

Details Diff 		COMP: C++11 require space between string constants

C++11 now allows for custom type specifiers so needs
a space when two string constants are to be concatenated.

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

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

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22820 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Base/QTCore/qSlicerCorePythonManager.cxx Diff File

master 486fa12b

2014-01-14 13:58:22

jcfr

Details Diff 		COMP: vtkPichonFastMarching - Replace finite() with isfinite()

finite() is not universally in the c standard.
isfinite is support in all c compilers since
c99.

As of Mac 10.9 under clang, finite() issues a
warning that it will be deprecated and that the
standards conforming isfinite() should be used.

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

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22819 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Modules/Scripted/EditorLib/Logic/vtkPichonFastMarching.cxx Diff File
mod - Modules/Scripted/EditorLib/Logic/vtkPichonFastMarchingPDF.cxx Diff File

master b9dbe4e7

2014-01-14 13:58:18

jcfr

Details Diff 		COMP: vtkTeem - Remove cmake configuration warning

CMake Warning (dev) in Libs/vtkTeem/CMakeLists.txt:
Syntax Warning in cmake code at
Slicer/Libs/vtkTeem/CMakeLists.txt:21:55

Argument not separated from preceding token by whitespace.

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

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22818 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Libs/vtkTeem/CMakeLists.txt Diff File
 First  Prev  1 2 3 ... 10 ... 20 ... 30 ... 40 ... 50 ... 60 ... 70 ... 80 ... 90 ... 100 ... 110 ... 120 ... 126 127 128 129 130 131 132 133 134 135  Next  Last