Merge branch 'T25160-COMPFixIssues'
a1bf14afa256
Actions

Description

Merge branch 'T25160-COMPFixIssues'

Hopefully fix compile errors.

Conflicts:
Modules/PhotoacousticsLib/test/files.cmake

Details

Provenance

• groehl	Authored on Jul 30 2018, 6:52 PM
• groehl	Pushed on Jul 30 2018, 4:55 PM

Parents

rMITK5f043eb3f737: deactivate MC test bc of performance issue
rMITKc28b29ac4a1f: Merge branch 'T24606-MergeSpectralUnmixing'

Branches

Unknown

Tags

Unknown

Event Timeline

• groehl committed rMITKa1bf14afa256: Merge branch 'T25160-COMPFixIssues' (authored by • groehl).Jul 30 2018, 6:52 PM

Merged Changes

5f043eb3f737 deactivate MC test bc of performance issue
Author
• groehl
Browse Repository
No Builds
No Audits
1f7a48452576 remove image saving tests remove hard HDD link from test code
Author
• groehl
Browse Repository
No Builds
No Audits
131ff08956eb disable photoacoustic miniapps per default
Author
• groehl
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

Modules/

PhotoacousticsAlgorithms/

MitkPABeamformingTool/

CMakeLists.txt

PhotoacousticsLib/

MitkPAPhantomGenerator/

CMakeLists.txt

MitkTissueBatchGenerator/

CMakeLists.txt

test/

files.cmake

mitkPhotoacousticImageSaving.cpp

mitkPhotoacousticImageSavingTest.cpp

mitkPhotoacousticVesselTest.cpp

rMITKa1bf14afa256

View Options

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/CMakeLists.txt

View Options

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/CMakeLists.txt

View Options

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/CMakeLists.txt

View Options

Modules/PhotoacousticsLib/test/files.cmake

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSaving.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSavingTest.cpp

View Options

Modules/PhotoacousticsLib/test/mitkPhotoacousticVesselTest.cpp

Merge branch 'T25160-COMPFixIssues'a1bf14afa256Actions

Description

Details

Event Timeline

Merged Changes

Changes (7)

rMITKa1bf14afa256

Modules/PhotoacousticsAlgorithms/MitkPABeamformingTool/CMakeLists.txt

Modules/PhotoacousticsLib/MitkPAPhantomGenerator/CMakeLists.txt

Modules/PhotoacousticsLib/MitkTissueBatchGenerator/CMakeLists.txt

Modules/PhotoacousticsLib/test/files.cmake

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSaving.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticImageSavingTest.cpp

Modules/PhotoacousticsLib/test/mitkPhotoacousticVesselTest.cpp

Merge branch 'T25160-COMPFixIssues'
a1bf14afa256
Actions