Bug #2524: Addition of CMake build files - completion of variable assignments

Some source file names were added to variable assignments in CMake scripts
to update relevant dependencies.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Author: elfring

cli/CMakeLists.txt

@@ -4,10 +4,11 @@ find_package(PCRE REQUIRED)
 set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
 
 SET(CPPCHECK_CLI_SOURCES
+  cmdlineparser.cpp
   cppcheckexecutor.cpp
   filelister.cpp
-  threadexecutor.cpp
   main.cpp
+  threadexecutor.cpp
   "${TINYXML_INCLUDE_DIR}tinystr.cpp"
   "${TINYXML_INCLUDE_DIR}tinyxml.cpp"
   "${TINYXML_INCLUDE_DIR}tinyxmlerror.cpp"
@@ -34,6 +35,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 include_directories(${CPPCHECK_SOURCE_DIR}/lib
+                    "${PCRE_INCLUDE_DIR}"
                     "${TINYXML_INCLUDE_DIR}")
 add_executable(cppcheck ${CPPCHECK_CLI_SOURCES} ${CPPCHECK_LIB_SOURCES})
-TARGET_LINK_LIBRARIES(cppcheck ${CPPCHECK_CLI_LINK_LIBRARIES})
+target_link_libraries(cppcheck ${CPPCHECK_CLI_LINK_LIBRARIES} ${PCRE_LIBRARIES})

gui/CMakeLists.txt

@@ -24,17 +24,24 @@ SET(CPPCHECK_GUI_HEADERS
   aboutdialog.h
   applicationdialog.h
   applicationlist.h
+  checkstatistics.h
   checkthread.h
   common.h
   csvreport.h
+  erroritem.h
+  filelist.h
   fileviewdialog.h
   helpwindow.h
   mainwindow.h
+  logview.h
+  project.h
   projectfile.h
+  projectfiledialog.h
   report.h
   resultstree.h
   resultsview.h
   settingsdialog.h
+  statsdialog.h
   threadhandler.h
   threadresult.h
   translationhandler.h
@@ -45,18 +52,26 @@ SET(CPPCHECK_GUI_HEADERS
 # Source files
 SET(CPPCHECK_GUI_SOURCES
   aboutdialog.cpp
-  applicationdialog.cpp 
+  applicationdialog.cpp
   applicationlist.cpp
+  checkstatistics.cpp
   checkthread.cpp
   csvreport.cpp
+  erroritem.cpp
+  filelist.cpp
   fileviewdialog.cpp
+  helpwindow.cpp
+  logview.cpp
   main.cpp
   mainwindow.cpp
+  project.cpp
   projectfile.cpp
+  projectfiledialog.cpp
   report.cpp
   resultstree.cpp
   resultsview.cpp
   settingsdialog.cpp
+  statsdialog.cpp
   threadhandler.cpp
   threadresult.cpp
   translationhandler.cpp
@@ -69,20 +84,27 @@ SET(CPPCHECK_UIS
   about.ui
   application.ui
   file.ui
+  helpwindow.ui
+  logview.ui
   main.ui
+  projectfile.ui
   resultsview.ui
   settings.ui
+  stats.ui
 )
 
 # Translation files
 SET(CPPCHECK_GUI_TRANS
   cppcheck_de.ts
-  cppcheck_fi.ts
-  cppcheck_pl.ts
-  cppcheck_se.ts
   cppcheck_en.ts
+  cppcheck_fi.ts
+  cppcheck_fr.ts
+  cppcheck_ja.ts
   cppcheck_nl.ts
+  cppcheck_pl.ts
   cppcheck_ru.ts
+  cppcheck_se.ts
+  cppcheck_sr.ts
 )
 
 set(CPPCHECK_LIB_DIR "${CPPCHECK_SOURCE_DIR}/lib/")

test/CMakeLists.txt

@@ -4,32 +4,44 @@ find_package(PCRE REQUIRED)
 set(TINYXML_INCLUDE_DIR "${CPPCHECK_SOURCE_DIR}/externals/tinyxml/")
 
 SET(CPPCHECK_TEST_SOURCES
+  "${CPPCHECK_SOURCE_DIR}/cli/cmdlineparser.cpp"
+  "${CPPCHECK_SOURCE_DIR}/cli/cppcheckexecutor.cpp"
   "${CPPCHECK_SOURCE_DIR}/cli/filelister.cpp"
+  "${CPPCHECK_SOURCE_DIR}/cli/threadexecutor.cpp"
+  options.cpp
+  testautovariables.cpp
+  testbufferoverrun.cpp
+  testcharvar.cpp
+  testclass.cpp
+  testcmdlineparser.cpp
+  testconstructors.cpp
+  testcppcheck.cpp
+  testdivision.cpp
+  testerrorlogger.cpp
+  testexceptionsafety.cpp
+  testincompletestatement.cpp
+  testmathlib.cpp
   testmemleak.cpp
+  testnullpointer.cpp
+  testobsoletefunctions.cpp
+  testoptions.cpp
   testother.cpp
+  testpath.cpp
+  testpostfixoperator.cpp
   testpreprocessor.cpp
-  testautovariables.cpp
-  testredundantif.cpp
-  testbufferoverrun.cpp
   testrunner.cpp
-  testcharvar.cpp
+  testsettings.cpp
   testsimplifytokens.cpp
-  testclass.cpp
   teststl.cpp
-  testconstructors.cpp
   testsuite.cpp
-  testcppcheck.cpp
-  testdangerousfunctions.cpp
+  testsymboldatabase.cpp
+  testthreadexecutor.cpp
   testtoken.cpp
-  testdivision.cpp
   testtokenize.cpp
-  testexceptionsafety.cpp
+  testuninitvar.cpp
   testunusedfunctions.cpp
-  testfilelister.cpp
   testunusedprivfunc.cpp
-  testincompletestatement.cpp
   testunusedvar.cpp
-  testmathlib.cpp
   "${TINYXML_INCLUDE_DIR}tinystr.cpp"
   "${TINYXML_INCLUDE_DIR}tinyxml.cpp"
   "${TINYXML_INCLUDE_DIR}tinyxmlerror.cpp"
@@ -47,7 +59,7 @@ if(WIN32)
       set(CPPCHECK_TEST_LINK_LIBRARIES ${CPPCHECK_TEST_LINK_LIBRARIES} shlwapi)
    endif()
 else()
-   set(CPPCHECK_TEST_SOURCES ${CPPCHECK_TEST_SOURCES}
+   set(CPPCHECK_TEST_SOURCES ${CPPCHECK_TEST_SOURCES} testfilelister_unix.cpp
        "${CPPCHECK_SOURCE_DIR}/cli/filelister_unix.cpp")
 endif()
 
@@ -56,6 +68,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
 include_directories("${CPPCHECK_SOURCE_DIR}/lib"
+                    "${CPPCHECK_SOURCE_DIR}/cli"
                     "${PCRE_INCLUDE_DIR}"
                     "${TINYXML_INCLUDE_DIR}")
 add_executable(test ${CPPCHECK_TEST_SOURCES} ${CPPCHECK_LIB_SOURCES})