From f50aa683629b27afc8e2edd3bb25fef4005a68a8 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Sat, 26 Mar 2011 13:20:10 +0100 Subject: [PATCH 1/3] Addition of a file name in a CMake script (bug #2524, #1690) A few source files were added because of the feature request "Ability to exclude files and directories from checks". https://github.com/danmar/cppcheck/commit/6401271ceb85ff93a697b2c09fb4765a560fb7a3 A CMake build script was updated for these changes. Signed-off-by: Markus Elfring --- test/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 880dc24be0a..13d40551543 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -28,6 +28,7 @@ SET(CHECKTEST_SRCS testoptions.cpp testother.cpp testpath.cpp + testpathmatch.cpp testpostfixoperator.cpp testpreprocessor.cpp testrunner.cpp From 32530f85cbdf61e345955dac0d6a592285a65d43 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Sat, 26 Mar 2011 13:50:10 +0100 Subject: [PATCH 2/3] Renaming of the GUI executable to "cppcheck-gui" in a CMake script (bug #2524) The executable file for the graphical user interface was renamed in a CMake script to synchronise this setting with the qmake build specification. https://github.com/danmar/cppcheck/commit/b88ce77e4ac85d1b32981c63cb5c538e9740b6e9#gui/gui.pro Signed-off-by: Markus Elfring --- gui/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 1b9d456740c..11c3aec18e2 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -147,9 +147,9 @@ SOURCE_GROUP("Header Files" FILES ${CHECK_HEADERS}) SOURCE_GROUP("Ui Files" ".ui$") SOURCE_GROUP("Moc Files" "moc_.*cxx$") -ADD_EXECUTABLE(gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS} +ADD_EXECUTABLE(cppcheck-gui WIN32 ${CHECKGUI_SRCS} ${CHECK_MOC_SRCS} ${CHECK_HEADERS} ${CHECK_UIS_H} ${CHECK_RCC_SRCS} ${CPPCHECK_LIB_SOURCES}) -TARGET_LINK_LIBRARIES(gui ${CHECK_LIBS} ${PCRE_LIBRARIES} ${QT_LIBRARIES}) +TARGET_LINK_LIBRARIES(cppcheck-gui ${CHECK_LIBS} ${PCRE_LIBRARIES} ${QT_LIBRARIES}) ELSE(QT4_FOUND) message("GUI not built since QT4 not found.") From 71c13362eab8b5acb24ac9fd4e609426668c5d41 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Sat, 26 Mar 2011 14:20:48 +0100 Subject: [PATCH 3/3] Renaming of the file for the Swedish translation in a CMake script (bug #2524) A translation file was renamed to use the correct ISO-639 name. https://github.com/danmar/cppcheck/commit/03bd4fa463e3e6b6dbcde4261ea6d08d992d6417#gui/gui.pro Signed-off-by: Markus Elfring --- gui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 11c3aec18e2..69ceb6919e2 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -107,8 +107,8 @@ SET(CHECK_TRANS cppcheck_nl.ts cppcheck_pl.ts cppcheck_ru.ts - cppcheck_se.ts cppcheck_sr.ts + cppcheck_sv.ts ) SET(CHECK_RCCS gui.qrc)