Skip to content

Commit

Permalink
Reverting CMakeLists.txt to NOT build ImageViewer
Browse files Browse the repository at this point in the history
ImageViewer build is failing for some unknown reason on VC.
Reverting for now and will deal with this tomorrow.
refs #5058
  • Loading branch information
DennisMikkelson committed Apr 4, 2012
1 parent 904fb13 commit 5960918
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions Code/Mantid/MantidQt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ add_subdirectory ( CustomDialogs )
add_subdirectory ( CustomInterfaces )
add_subdirectory ( DesignerPlugins )
add_subdirectory ( SliceViewer )
add_subdirectory ( ImageViewer )
add_subdirectory ( Factory )


Expand All @@ -35,11 +34,9 @@ if ( MSVC_IDE )
set_property ( TARGET CustomInterfaces PROPERTY FOLDER "MantidQt" )
set_property ( TARGET DesignerPlugins PROPERTY FOLDER "MantidQt" )
set_property ( TARGET MantidQtSliceViewer PROPERTY FOLDER "MantidQt" )
set_property ( TARGET MantidQtImageViewer PROPERTY FOLDER "MantidQt" )
else ()
add_custom_target ( MantidQt DEPENDS MantidQtAPI MantidWidgets
CustomDialogs CustomInterfaces
MantidQtSliceViewer MantidQtImageViewer
CustomDialogs CustomInterfaces MantidQtSliceViewer
)
endif ()

Expand Down Expand Up @@ -119,9 +116,6 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/SliceViewer/inc )
include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/MantidWidgets/inc )
include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/SliceViewer ) # to find the ui_*.h auto-generated files

include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/ImageViewer/inc )
include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/ImageViewer ) #to find ui*.h

# This creates the target library, just for python bindings
add_library ( mantidqtpython MODULE ${SIP_SRC} )

Expand All @@ -138,7 +132,7 @@ endif ()

# ... and links to other required libs ...
target_link_libraries ( mantidqtpython
MantidQtAPI QtPropertyBrowser MantidQtSliceViewer MantidQtImageViewer MantidQtFactory
MantidQtAPI QtPropertyBrowser MantidQtSliceViewer MantidQtFactory
${QT_LIBRARIES} ${QWT_LIBRARIES}
${PYTHON_LIBRARIES}
)
Expand Down

0 comments on commit 5960918

Please sign in to comment.