Skip to content

Commit

Permalink
Don't require a debug build of ParaView on MSVC.
Browse files Browse the repository at this point in the history
Refs #12719
  • Loading branch information
martyngigg committed Jul 7, 2015
1 parent 9987a61 commit f3ec7ce
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions Code/Mantid/Vates/ParaviewPlugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,21 @@ elseif(MSVC)
# find_library won't find dlls only import libraries so just hardcode them
# Release
set( _pvplugins_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Release/${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR} )
set( _plugins_dir
if (NOT ${_pvplugins_dir} )
file( MAKE_DIRECTORY ${_pvplugins_dir} )
file( COPY ${ParaView_DIR}/bin/Release/NonOrthogonalSource.dll DESTINATION ${_pvplugins_dir} )
endif ()
install( FILES ${ParaView_DIR}/bin/Release/NonOrthogonalSource.dll DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR}/NonOrthogonalSource.dll)
install( FILES ${ParaView_DIR}/bin/Release/NonOrthogonalSource.dll DESTINATION ${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR}/NonOrthogonalSource.dll )
# Debug
set( _pvplugins_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Debug/${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR} )
if (NOT ${_pvplugins_dir} )
file( MAKE_DIRECTORY ${_pvplugins_dir} )
file( COPY ${ParaView_DIR}/bin/Debug/NonOrthogonalSource.dll DESTINATION ${_pvplugins_dir} )
endif ()
# Don't install the debug as the packaging is broken under debug
if (EXISTS ${ParaView_DIR}/bin/Debug/NonOrthogonalSource.dll)
set( _pvplugins_dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Debug/${PVPLUGINS_DIR}/${PVPLUGINS_SUBDIR} )
if (NOT ${_pvplugins_dir} )
file( MAKE_DIRECTORY ${_pvplugins_dir} )
file( COPY ${ParaView_DIR}/bin/Debug/NonOrthogonalSource.dll DESTINATION ${_pvplugins_dir} )
endif ()
# Don't install the debug as the packaging is broken under debug
endif()
else ()
message ( WARNING "Unknown multi-configuration generator. Cannot copy NonOrthogonalSource plugin to our plugin directory." )
endif()
Expand Down

0 comments on commit f3ec7ce

Please sign in to comment.