Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 19, 2014
  1. @jcfr

    Fix export of CTKTesting include directories

    jcfr authored
    By leveraging the build system infrastructure and associating a
    "target_libraries.cmake" file with CTKTesting, this commit ensures
    that the associated directory are automatically exported
    in CTKConfig.cmake
    
    To successfully achieve this, the following has been done:
     (1) addition of an empty "target_libraries.cmake"
     (2) fix to DGraph so that the topological path of a standalone vertex
    is the vertex itself and not the list of all vertices topologically sorted.
    Note that more work would be required to teach DGraph to detect invalid
    labels.
     (3) teach ctkFunctionCollectTargetLibraryNames how to handle empty
    list of target libraries.
Commits on Apr 14, 2014
  1. @jcfr

    Merge remote-tracking branch 'jcfr/397-remove-unused-find-ctk-module'

    jcfr authored
    * jcfr/397-remove-unused-find-ctk-module:
      Remove unused FindCTK.cmake module
Commits on Jan 7, 2014
  1. @jcfr

    Allow FindDCMTK.cmake to be re-used directly adding missing module.

    jcfr authored
    Usage of 'find_package_handle_standard_args' was initially introduced
    by commit 52d9539.
    
    For more details about the issue, see http://forum.dcmtk.org/viewtopic.php?f=1&t=3906&p=15599#p15599
    
    See #431
Commits on Nov 24, 2013
  1. @jcfr

    FindDCMTK - Clean white spaces

    jcfr authored
  2. @jcfr

    FindDCMTK - Do not explicitly set DCMTK_DEFINITIONS

    jcfr authored
    Following commit commontk/CTK@12c052 fixing a packaging Debian bug,
    the DCMTK_DEFINITIONS was set directly inside the FindDCMTK.cmake
    module using "add_definitions".
    
    When used outside of this project, setting automatically the definition
    could have some unintended effects. For example, by globally adding
    DCMTK_DEFINITIONS (and more specifically HAVE_CONFIG_H), it prevented from
    compiling successfully program against the "tclap" library. Compile errors
    like the following occurred:
    
    // ------------------
    In file included from <DIR>/SlicerExecutionModel/tclap/include/tclap/CmdLine.h:27:0,
                     from <DIR>/Slicer-build/Modules/CLI/CheckerBoardFilter/CheckerBoardFilterCLP.h:13,
                     from <SRC>/Modules/CLI/CheckerBoardFilter/CheckerBoardFilter.cxx:23:
    <DIR>/SlicerExecutionModel/tclap/include/tclap/MultiSwitchArg.h:44:2: error: #error "Need a stringstream (sstream or strstream) to compile!"
     #error "Need a stringstream (sstream or strstream) to compile!"
      ^
    <DIR>/SlicerExecutionModel/tclap/include/tclap/MultiSwitchArg.h:171:2: error: #error "Need a stringstream (sstream or strstream) to compile!"
     #error "Need a stringstream (sstream or strstream) to compile!"
      ^
    In file included from <DIR>/SlicerExecutionModel/tclap/include/tclap/UnlabeledValueArg.h:30:0,
                     from <DIR>/SlicerExecutionModel/tclap/include/tclap/CmdLine.h:28,
                     from <DIR>/Slicer-build/Modules/CLI/CheckerBoardFilter/CheckerBoardFilterCLP.h:13,
                     from <SRC>/Modules/CLI/CheckerBoardFilter/CheckerBoardFilter.cxx:23:
    <DIR>/SlicerExecutionModel/tclap/include/tclap/ValueArg.h:43:2: error: #error "Need a stringstream (sstream or strstream) to compile!"
     #error "Need a stringstream (sstream or strstream) to compile!"
      ^
    <DIR>/SlicerExecutionModel/tclap/include/tclap/ValueArg.h:97:2: error: #error "Need a stringstream (sstream or strstream) to compile!"
     #error "Need a stringstream (sstream or strstream) to compile!"
      ^
    // ------------------
    
    See #382
Commits on Nov 14, 2013
  1. @jcfr
Commits on Nov 13, 2013
  1. @jcfr

    Ensure DCMTK libraries can be found on system without setting DCMTK_DIR

    jcfr authored
    See inlined comment for more details.
    
    See #382
  2. @jcfr

    Improve FindDCMTK.cmake documentation

    jcfr authored
    Also added a troubleshooting section addressing issue #382
Commits on Nov 5, 2013
  1. @jcfr

    Remove unused FindCTK.cmake module

    jcfr authored
    Since CTK targets are exported into a CTKConfig.cmake file, there is
    no need for such module. It would simply add extra maintenance work
    without real advantage.
    
    See #397
Commits on Nov 4, 2013
  1. @nolden
Commits on May 20, 2013
  1. @jcfr

    COMP: Make FindDCMTK more verbose

    jcfr authored
    It will display the following text:
    
    -- Trying to find DCMTK expecting DCMTKConfig.cmake
    -- Trying to find DCMTK expecting DCMTKConfig.cmake - failed
    -- Trying to find DCMTK relying on FindDCMTK.cmake
    -- Trying to find DCMTK relying on FindDCMTK.cmake - ok
  2. @jcfr

    COMP: Ensure FindDCMTK module works with and without DCMTKConfig.cmak…

    jcfr authored
    …e file
    
    In the case the provided DCMTK build or install tree doesn't have a
    DCMTKConfig.cmake file, the first call to "find_package" should fail
    quietly so that it doesn't prevent the rest of discovery process from working
    as expected.
    
    See #329
Commits on Mar 28, 2013
  1. @jcfr

    Update FindDCMTK.cmake module to support NO_MODULE mode

    jcfr authored
    This will allow to build CTK against the patched-3 branch available on
    github.com/commontk/DCMTK [1]
    
    [1] https://github.com/commontk/DCMTK/tree/patched-3
    
    Contributed-by: Kent Williams <norman-k-williams@uiowa.edu>
Commits on Aug 14, 2012
  1. rearranged libraries according to dependency

    Caspar Goch authored
  2. Add pthread to Link libraries and merge loops

    Caspar Goch authored
  3. Added pthread package search

    Caspar Goch authored
Commits on Aug 13, 2012
  1. Removed debug output

    Caspar Goch authored
  2. Debug and release libs are now stored separately

    Caspar Goch authored
    Changed the DCMTK script to install the debug and release libs as well as
    the binaries to Debug/Release subfolders. Furthermore changed the
    FindDCMTK scipt to search these folders and add only the libs
    corresponding to the current build selection.
    
    This was done to fix the inability to do a Microsoft Visual Studio 2010
    Debug and Release superbuild.
Commits on Jul 20, 2012
  1. @jcfr

    Library depending on debug build of PythonQt will link against correc…

    jcfr authored
    …t python library
    
    Since CTK now depends on the 'patched-2' branch of PythonQt, this is
    required to ensure the _DEBUG macro will be undefined
    within PythonQtPythonInclude.h. By undefining _DEBUG, both PythonQt or any
    library linking against it can successfully link against release
    python library.
    
    See https://github.com/commontk/PythonQt/blob/6366f002a93aa238c55f58de949d09c552cda5a9/src/PythonQtPythonInclude.h#L62
    
    This will fix error like the following:
    
    19>3>5>Generating moc_ctkVTKConnection.cxx
    19>3>4>LINK : fatal error LNK1104: cannot open file 'python26_d.lib'
    
    See issue #203
Commits on Mar 27, 2012
  1. @jcfr
Commits on Dec 12, 2011
  1. @jcfr @finetjul

    Expose ctkMacroGenerateMocs.cmake and ctkTest.h also if BUILD_TESTING…

    jcfr authored finetjul committed
    … is OFF
Commits on Dec 8, 2011
  1. @jcfr
Commits on Nov 18, 2011
  1. @saschazelzer

    Merge branch '26-CTK-windows-configuration-error-dgraph-related'

    saschazelzer authored
    Fixes issue #26
    
    * 26-CTK-windows-configuration-error-dgraph-related:
      Fixed memory leak
      26 dgraph in STL, compile and unit test pass
      26 dgraph in STL, compile and unit test pass
    
    Conflicts:
    	Utilities/DGraph/CMakeLists.txt
Commits on Nov 17, 2011
  1. @MattClarkson

    Fixed memory leak

    MattClarkson authored
  2. @MattClarkson
  3. @jcfr

    Remove text between parentheses in "else()", "endif()" and "endforeac…

    jcfr authored
    …h()". See #79
    
    The following script allowed to automatize the work:
    
    #!/bin/sh
    
    for file in $(find . -type f -name '*\.cmake' -o -name '*\.txt' -o -name '*\.ctest')
    do
      echo "Processing file [$file]"
    
      sed -i "s/endif(.*)/endif()/gI" $file
      sed -i "s/else(.*)/else()/gI" $file
      sed -i "s/endforeach(.*)/endforeach()/gI" $file
    done
  4. @jcfr

    Change CMake command to lower case. See #78

    jcfr authored
    The following script allows to automatically update all files:
    
    
    #!/bin/sh
    
    for file in $(find . -type f -name '*\.cmake' -o -name '*\.txt' -o -name '*\.ctest')
    do
      echo "Processing file [$file]"
      for cmd in $(cmake --help-command-list)
      do
        sed -i "s/${cmd}(/${cmd}(/gI" $file
      done
    done
Commits on Nov 16, 2011
  1. @jcfr
  2. @saschazelzer

    Removed QtMobility stuff.

    saschazelzer authored
Commits on Oct 25, 2011
  1. @saschazelzer

    Use CTK_PLUGIN_<type>_OUTPUT_DIRECTORY vars for customization.

    saschazelzer authored
    Using these CMake variables allows to control the output directories
    for CTK plug-ins.
  2. @saschazelzer
Commits on Oct 6, 2011
  1. @jcfr

    External project specific variable can be automatically added to CTKC…

    jcfr authored
    …onfig
    
    * Variables like VTK_DIR, Log4Qt_DIR .. will be prefixed by "CTK_" and added
    to CTKConfig.cmake
Commits on Sep 29, 2011
  1. @jcfr

    PythonQt module can be compiled either as python module or as static …

    jcfr authored
    …library
    
    * A convenient macro named ctkMacroBuildLibWrapper has been added
    
    * Decorators are not compiled anymore within the CTK library itself but
    are included in a dedicated library named "<LIBNAME>PythonQt" that can
    be either a static library or a python module.
    
    * If any, the decorator associated with a library has to be named following
    this pattern: "<LIBNAME>PythonQtDecorators.h"
    
    * .. and a function named "init<LIBNAME>PythonQtDecorators()" in
    charge of registering the decorator is expected.
    
    * Instead of the function "PythonQt_init_<NAMESPACE>_<LIBNAME>(PyObject*)",
    the function "init<LIBNAME>PythonQt" is now exposed.
Commits on Jul 28, 2011
  1. @trabs
Something went wrong with that request. Please try again.