Diffusion MITK aa8c318a6437

Merge branch 'bug-12888-SOFASuperBuildIntegration2'
aa8c318a6437
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-12888-SOFASuperBuildIntegration2'

Details

Provenance

Authored on Jan 21 2013, 4:40 PM

Parents

rMITKca56b07e1023: Changed link to SOFA archive to official third party link.
rMITKe050bd3db102: Merge branch 'bug-13980-mitkUIDGeneratorGeneratesEqualUIDs'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKaa8c318a6437: Merge branch 'bug-12888-SOFASuperBuildIntegration2' (authored by kislinsk).Jan 21 2013, 4:40 PM

Merged Changes

ca56b07e1023 Changed link to SOFA archive to official third party link.
Author
kislinsk
Browse Repository
No Builds
No Audits
df6a02369ba2 Adapted CMakeExernals script for SOFA to new MITK-SOFA workflow.
Author
kislinsk
Browse Repository
No Builds
No Audits
bf1dc77b4800 Attempt to fix GCC 4.6 release compilation errors.
Author
kislinsk
Browse Repository
No Builds
No Audits
c933d76a2aea Reduced number of runtime paths set for SOFA.
Author
kislinsk
Browse Repository
No Builds
No Audits
0cc0dce753e4 Fixed SOFA dependencies for Mac.
Author
kislinsk
Browse Repository
No Builds
No Audits
e733651461ac Continued writing documentation.
Author
kislinsk
Browse Repository
No Builds
No Audits
d2f25d9ca757 Continued writing documentation and updated SOFA OpenGL stub to work with linux.
Author
kislinsk
Browse Repository
No Builds
No Audits
95936dcf8224 Wrote SOFA patch for MITK integration.
Author
kislinsk
Browse Repository
No Builds
No Audits
a219e962c804 Improved fake OpenGL, GLU, GLUT, GLEW, WGL, and GLX for SOFA.
Author
kislinsk
Browse Repository
No Builds
No Audits
078e87f4d8a2 Updated SOFA to revision 8935.
Author
kislinsk
Browse Repository
No Builds
No Audits
9d8cfc3d43c6 Began documentation.
Author
kislinsk
Browse Repository
No Builds
No Audits
4b72f467cb16 Fixed linux and 64 bit portability bugs.
Author
kislinsk
Browse Repository
No Builds
No Audits
67ff1bedcd3a Fixed SOFA OpenGL stub for Ubuntu 12.04.
Author
kislinsk
Browse Repository
No Builds
No Audits
6e046d63be45 Implemented texture support.
Author
kislinsk
Browse Repository
No Builds
No Audits
0637858c4c83 Fixed wrong filenames for SOFA patch download and extract scripts.
Author
kislinsk
Browse Repository
No Builds
No Audits
677f889b2564 Removed OpenGL, GLU, GLUT, and GLEW dependencies from SOFA.
Author
kislinsk
Browse Repository
No Builds
No Audits
0f684bb69324 Squashed all commits into huge commit to be able to push to origin (trailing…
Author
kislinsk
Browse Repository
No Builds
No Audits
12ec966471c3 Removed dicom.qrc file.
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (52)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

CMake/

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_SOFA_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionCreateWindowsBatchScript.cmake

O1: MITK Reviewer Group I

mitkMacroInstallTargets.cmake

O1: MITK Reviewer Group I

CMakeExternals/

PatchSOFA-rev8935.cmake

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

Documentation/

Doxygen/

DeveloperManual/

BuildInstructions.dox

ThirdPartyLibs.dox

UserManual/

MITKModuleManualsList.dox

MITKConfig.cmake.in

O1: MITK Reviewer Group I

Modules/

mitkSimulation.cpp

mitkSimulation.h

mitkSimulationDrawTool.cpp

mitkSimulationDrawTool.h

mitkSimulationIOFactory.cpp

mitkSimulationIOFactory.h

mitkSimulationMapper3D.cpp

mitkSimulationMapper3D.h

mitkSimulationModel.cpp

mitkSimulationModel.h

mitkSimulationObjectFactory.cpp

mitkSimulationObjectFactory.h

mitkSimulationPropAssemblyVisitor.cpp

mitkSimulationPropAssemblyVisitor.h

mitkSimulationReader.cpp

mitkSimulationReader.h

Plugins/

PluginList.cmake

org.mitk.gui.qt.simulation

manifest_headers.cmake

QmitkSimulationView.cpp

QmitkSimulationView.h

QmitkSimulationViewControls.ui

org_mitk_gui_qt_simulation_Activator.cpp

org_mitk_gui_qt_simulation_Activator.h

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITKaa8c318a6437

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

Loading...

CMake/MITKDashboardSetup.cmake

Loading...

CMake/PackageDepends/MITK_SOFA_Config.cmake

Loading...

CMake/mitkFunctionCreateWindowsBatchScript.cmake

Loading...

CMake/mitkMacroInstallTargets.cmake

Loading...

CMakeExternals/PatchSOFA-rev8935.cmake

Loading...

CMakeExternals/SOFA.cmake

Loading...

CMakeLists.txt

Loading...

Documentation/Doxygen/DeveloperManual/BuildInstructions.dox

Loading...

Documentation/Doxygen/DeveloperManual/ThirdPartyLibs.dox

Loading...

Documentation/Doxygen/UserManual/MITKModuleManualsList.dox

Loading...

MITKConfig.cmake.in

Loading...

Modules/CMakeLists.txt

Loading...

Modules/Simulation/CMakeLists.txt

Loading...

Modules/Simulation/Documentation/doxygen/Manual.dox

Loading...

Modules/Simulation/files.cmake

Loading...

Modules/Simulation/mitkSimulation.cpp

Loading...

Modules/Simulation/mitkSimulation.h

Loading...

Modules/Simulation/mitkSimulationDrawTool.cpp

Loading...

Modules/Simulation/mitkSimulationDrawTool.h

Loading...

Modules/Simulation/mitkSimulationIOFactory.cpp

Loading...

Modules/Simulation/mitkSimulationIOFactory.h

Loading...

Modules/Simulation/mitkSimulationMapper3D.cpp

Loading...

Modules/Simulation/mitkSimulationMapper3D.h

Loading...

Modules/Simulation/mitkSimulationModel.cpp

Loading...

Modules/Simulation/mitkSimulationModel.h

Loading...

Modules/Simulation/mitkSimulationObjectFactory.cpp

Loading...

Modules/Simulation/mitkSimulationObjectFactory.h

Loading...

Modules/Simulation/mitkSimulationPropAssemblyVisitor.cpp

Loading...

Modules/Simulation/mitkSimulationPropAssemblyVisitor.h

Loading...

Modules/Simulation/mitkSimulationReader.cpp

Loading...

Modules/Simulation/mitkSimulationReader.h

Loading...

Plugins/PluginList.cmake

Loading...

Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt

Loading...

Plugins/org.mitk.gui.qt.simulation/files.cmake

Loading...

Plugins/org.mitk.gui.qt.simulation/manifest_headers.cmake

Loading...

Plugins/org.mitk.gui.qt.simulation/plugin.xml

Loading...

Plugins/org.mitk.gui.qt.simulation/resources/Simulation.qrc

Loading...

Plugins/org.mitk.gui.qt.simulation/resources/icon.png

Loading...

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp

Loading...

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.h

Loading...

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationViewControls.ui

Loading...

Plugins/org.mitk.gui.qt.simulation/src/internal/org_mitk_gui_qt_simulation_Activator.cpp

Loading...

Plugins/org.mitk.gui.qt.simulation/src/internal/org_mitk_gui_qt_simulation_Activator.h

Loading...

SuperBuild.cmake

Loading...