Skip to content
Snippets Groups Projects
Commit 134b03ef authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Mark system dependencies so they don't generate warnings.

parent 7e0d196a
No related branches found
No related tags found
No related merge requests found
...@@ -163,8 +163,8 @@ std::string SingleValueParameter<Derived, ValType>::toXMLString() const { ...@@ -163,8 +163,8 @@ std::string SingleValueParameter<Derived, ValType>::toXMLString() const {
static std::string parameterName() { return #classname; } \ static std::string parameterName() { return #classname; } \
classname(type_ value) : SuperType(value) {} \ classname(type_ value) : SuperType(value) {} \
classname() : SuperType() {} \ classname() : SuperType() {} \
std::string getName() const { return #classname; } \ std::string getName() const override { return #classname; } \
classname *clone() const { return new classname(m_value); } \ classname *clone() const override { return new classname(m_value); } \
}; };
} }
} }
......
...@@ -422,7 +422,6 @@ endif(UNITY_BUILD) ...@@ -422,7 +422,6 @@ endif(UNITY_BUILD)
# ===================== Open Cascade =================== # ===================== Open Cascade ===================
if (ENABLE_OPENCASCADE) if (ENABLE_OPENCASCADE)
include_directories ( system ${OPENCASCADE_INCLUDE_DIR} )
set (SRC_FILES ${SRC_FILES} ${OPENCASCADE_SRC} ) set (SRC_FILES ${SRC_FILES} ${OPENCASCADE_SRC} )
endif () endif ()
...@@ -447,6 +446,11 @@ if (OSX_VERSION VERSION_GREATER 10.8) ...@@ -447,6 +446,11 @@ if (OSX_VERSION VERSION_GREATER 10.8)
set_target_properties ( Geometry PROPERTIES INSTALL_RPATH "@loader_path/../MacOS") set_target_properties ( Geometry PROPERTIES INSTALL_RPATH "@loader_path/../MacOS")
endif () endif ()
if (ENABLE_OPENCASCADE)
target_include_directories(Geometry SYSTEM PRIVATE ${OPENCASCADE_INCLUDE_DIR})
endif ()
# Add to the 'Framework' group in VS # Add to the 'Framework' group in VS
set_property ( TARGET Geometry PROPERTY FOLDER "MantidFramework" ) set_property ( TARGET Geometry PROPERTY FOLDER "MantidFramework" )
......
...@@ -36,7 +36,6 @@ qt4_wrap_ui( UI_BUILT_SOURCES ...@@ -36,7 +36,6 @@ qt4_wrap_ui( UI_BUILT_SOURCES
include_directories( include_directories(
inc inc
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${QWT_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/MantidQt/API/inc ${CMAKE_SOURCE_DIR}/MantidQt/API/inc
) )
...@@ -57,6 +56,8 @@ set_target_properties( VatesSimpleGuiQtWidgets PROPERTIES OUTPUT_NAME MantidVate ...@@ -57,6 +56,8 @@ set_target_properties( VatesSimpleGuiQtWidgets PROPERTIES OUTPUT_NAME MantidVate
# Add to the 'VatesSimpleGui' group in VS # Add to the 'VatesSimpleGui' group in VS
set_property( TARGET VatesSimpleGuiQtWidgets PROPERTY FOLDER MantidVatesSimpleGui ) set_property( TARGET VatesSimpleGuiQtWidgets PROPERTY FOLDER MantidVatesSimpleGui )
target_include_directories( VatesSimpleGuiQtWidgets SYSTEM PRIVATE ${QWT_INCLUDE_DIR})
target_link_libraries( VatesSimpleGuiQtWidgets LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} target_link_libraries( VatesSimpleGuiQtWidgets LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${POCO_LIBRARIES} ${POCO_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
......
...@@ -105,8 +105,6 @@ include_directories( ...@@ -105,8 +105,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../QtWidgets ${CMAKE_CURRENT_BINARY_DIR}/../QtWidgets
${CMAKE_SOURCE_DIR}/MantidPlot/src ${CMAKE_SOURCE_DIR}/MantidPlot/src
${QWT_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
) )
set( ALL_FILES set( ALL_FILES
...@@ -131,8 +129,7 @@ set_target_properties( VatesSimpleGuiViewWidgets PROPERTIES OUTPUT_NAME MantidVa ...@@ -131,8 +129,7 @@ set_target_properties( VatesSimpleGuiViewWidgets PROPERTIES OUTPUT_NAME MantidVa
# Add to the 'VatesSimpleGui' group in VS # Add to the 'VatesSimpleGui' group in VS
set_property( TARGET VatesSimpleGuiViewWidgets PROPERTY FOLDER MantidVatesSimpleGui ) set_property( TARGET VatesSimpleGuiViewWidgets PROPERTY FOLDER MantidVatesSimpleGui )
include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} ${PYTHON_INCLUDE_DIR} )
include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} )
target_link_libraries( VatesSimpleGuiViewWidgets LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} target_link_libraries( VatesSimpleGuiViewWidgets LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
pqApplicationComponents pqApplicationComponents
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment