Skip to content

Commit

Permalink
Adding more to cppcheck. Refs #4368.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Dec 29, 2011
1 parent 6fce3c6 commit 035a9be
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ endforeach ( PYFILE )
#############################################################################################

add_library ( PythonAPIModule ${SRC_FILES} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
add_cppcheck( PythonAPIModule )
set_python_properties( PythonAPIModule _api )
set_target_output_directory ( PythonAPIModule ${OUTPUT_DIR} .pyd )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ endforeach ( PYFILE )
#############################################################################################

add_library ( PythonGeometryModule ${SRC_FILES} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
add_cppcheck( PythonGeometryModule )
set_python_properties( PythonGeometryModule _geometry )
set_target_output_directory ( PythonGeometryModule ${OUTPUT_DIR} .pyd )
# Add the required dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ endforeach ( PYFILE )
#############################################################################################

add_library ( PythonKernelModule ${SRC_FILES} ${BOOST_PYTHON_SRC} ${INC_FILES} ${PYTHON_INSTALL_FILES} )
add_cppcheck( PythonKernelModule )
set_python_properties( PythonKernelModule _kernel )
set_target_output_directory ( PythonKernelModule ${OUTPUT_DIR} .pyd )
# Add the required dependencies
Expand Down
3 changes: 2 additions & 1 deletion Code/Mantid/MantidQt/API/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ add_definitions ( -DIN_MANTIDQT_API )
# Use a precompiled header where they are supported
ADD_PRECOMPILED_HEADER( inc/MantidQtAPI/PrecompiledHeader.h MantidQtAPI src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
add_library ( MantidQtAPI ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
add_cppcheck( MantidQtAPI )

target_link_libraries ( MantidQtAPI ${CORE_MANTIDLIBS} ${QT_LIBRARIES} ${QWT_LIBRARIES} )

Expand All @@ -100,4 +101,4 @@ install ( TARGETS MantidQtAPI DESTINATION ${LIB_DIR} )

set ( TEST_FILES
test/SyncedCheckboxesTest.h
)
)
1 change: 1 addition & 0 deletions Code/Mantid/MantidQt/CustomDialogs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ endif(UNITY_BUILD)
# Use a precompiled header where they are supported
ADD_PRECOMPILED_HEADER( inc/MantidQtCustomDialogs/PrecompiledHeader.h MantidQtCustomDialogs src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
add_library ( CustomDialogs ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
add_cppcheck( CustomDialogs )
# Set the name of the generated library
set_target_properties ( CustomDialogs PROPERTIES OUTPUT_NAME MantidQtCustomDialogs )

Expand Down
2 changes: 2 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ endif(UNITY_BUILD)
# Use a precompiled header where they are supported
ADD_PRECOMPILED_HEADER( inc/MantidQtCustomInterfaces/PrecompiledHeader.h MantidQtCustomInterfaces src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
add_library ( CustomInterfaces ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
add_cppcheck( CustomInterfaces )

# Set the name of the generated library
set_target_properties ( CustomInterfaces PROPERTIES OUTPUT_NAME MantidQtCustomInterfaces )

Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/MantidQt/DesignerPlugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ if(UNITY_BUILD)
endif(UNITY_BUILD)

add_library ( DesignerPlugins ${SRC_FILES} ${INC_FILES} ${MOCCED_FILES} )
add_cppcheck( DesignerPlugins )

# Change the destination of the target as Qt expects this in a directory called "designer"
SET_TARGET_OUTPUT_DIRECTORY( DesignerPlugins ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/designer )
Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/MantidQt/Factory/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ add_definitions ( -DIN_MANTIDQT_FACTORY )

# This creates the target library
add_library ( MantidQtFactory ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
add_cppcheck( MantidQtFactory )

# ... and links to other required libs
target_link_libraries ( MantidQtFactory MantidQtAPI QtPropertyBrowser MantidQtSliceViewer ${QT_LIBRARIES} ${QWT_LIBRARIES} )
Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/MantidQt/MantidWidgets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ add_definitions ( -DIN_MANTIDQT_MANTIDWIDGETS )
# Use a precompiled header where they are supported
ADD_PRECOMPILED_HEADER( inc/MantidQtMantidWidgets/PrecompiledHeader.h MantidQtMantidWidgets src/PrecompiledHeader.cpp ALL_SRC INC_FILES )
add_library ( MantidWidgets ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
add_cppcheck( MantidWidgets )

target_link_libraries ( MantidWidgets MantidQtAPI QtPropertyBrowser ${QT_LIBRARIES} ${QWT_LIBRARIES} )

Expand Down
2 changes: 2 additions & 0 deletions Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ add_definitions ( -DIN_MANTIDQT_SLICEVIEWER )

# This creates the target library
add_library ( MantidQtSliceViewer ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
add_cppcheck( MantidQtSliceViewer )

# ... and links to other required libs
target_link_libraries ( MantidQtSliceViewer MantidQtAPI QtPropertyBrowser ${QT_LIBRARIES} ${QWT_LIBRARIES} )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ qt4_wrap_cpp( MOCCED_FILES ${HDR_FILES} )

project( MantidParaViewQtWidgets )
add_library( MantidParaViewQtWidgets ${SRC_FILES} ${MOCCED_FILES} ${INC_FILES} )
add_cppcheck( MantidParaViewQtWidgets )
# Add to the 'Vates' group in VS
set_property( TARGET MantidParaViewQtWidgets PROPERTY FOLDER "MantidVates" )
target_link_libraries( MantidParaViewQtWidgets ${QT_LIBRARIES}
Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/Vates/VatesAPI/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ add_definitions( -DIN_MANTID_VATESAPI )
ADD_PRECOMPILED_HEADER( inc/MantidVatesAPI/PrecompiledHeader.h MantidVatesAPI src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
# Add the target for this directory
add_library( VatesAPI ${SRC_FILES} ${INC_FILES} )
add_cppcheck( VatesAPI )
# Set the name of the generated library
set_target_properties( VatesAPI PROPERTIES OUTPUT_NAME MantidVatesAPI )
# Add to the 'Framework' group in VS
Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/Vates/VatesSimpleGui/QtWidgets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ ${RES_FILES}
add_definitions( -DIN_MANTID_VATES_SIMPLEGUI_QTWIDGETS )
# Add the target for this directory
add_library( VatesSimpleGuiQtWidgets ${ALL_FILES} )
add_cppcheck( VatesSimpleGuiQtWidgets )
# Set the name of the generated library
set_target_properties( VatesSimpleGuiQtWidgets PROPERTIES OUTPUT_NAME MantidVatesSimpleGuiQtWidgets )
# Add to the 'VatesSimpleGui' group in VS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ ${RES_FILES}
add_definitions( -DIN_MANTID_VATES_SIMPLEGUI_VIEWWIDGETS )
# Add the target for this directory
add_library( VatesSimpleGuiViewWidgets ${ALL_FILES} )
add_cppcheck( VatesSimpleGuiViewWidgets )
# Set the name of the generated library
set_target_properties( VatesSimpleGuiViewWidgets PROPERTIES OUTPUT_NAME MantidVatesSimpleGuiViewWidgets )
# Add to the 'VatesSimpleGui' group in VS
Expand Down

0 comments on commit 035a9be

Please sign in to comment.