Reverted non-CMake changes in previous 'Added CMake files' commit

cli/cli.pro

@@ -1,15 +1,14 @@
 TEMPLATE = app
 TARGET = cppcheck
 DEPENDPATH += .
-TINYXML_DIR = ../externals/tinyxml/
+INCLUDEPATH += . ../lib
-INCLUDEPATH += . ../lib $${TINYXML_DIR}
 OBJECTS_DIR = temp
 CONFIG += warn_on
 CONFIG -= qt app_bundle
 DEFINES += HAVE_RULES
 
-BASEPATH = $${TINYXML_DIR}
+BASEPATH = ../externals/tinyxml/
-include($$PWD/$${TINYXML_DIR}tinyxml.pri)
+include($$PWD/../externals/tinyxml/tinyxml.pri)
 BASEPATH = ../lib/
 include($$PWD/../lib/lib.pri)
 

cli/cppcheck.vcproj

@@ -19,7 +19,7 @@
 			UseOfMfc="0">
 			<Tool
 				Name="VCCLCompilerTool"
-			AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\lib&quot;,&quot;..\externals\tinyxml&quot;,c:\Qt\VS4.7.0\mkspecs\win32-msvc2008"
+				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\lib&quot;,&quot;..\externals&quot;,&quot;..\externals\tinyxml&quot;,..\..\Qt\VS4.7.0\mkspecs\win32-msvc2008"
 				AdditionalOptions="-Zm200 -w34100 -w34189"
 				AssemblerListingLocation="temp\"
 				BufferSecurityCheck="false"
@@ -271,4 +271,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

cli/cppcheck.vcxproj

@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">
     <ClCompile>
-      <AdditionalIncludeDirectories>".";"..\lib";"..\externals\tinyxml";c:\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>".";"..\lib";"..\externals";"..\externals\tinyxml";..\..\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -84,11 +84,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">
     <ClCompile>
-<<<<<<< HEAD:cli/cppcheck.vcxproj
       <AdditionalIncludeDirectories>".";"..\lib";"..\externals";"..\externals\tinyxml";..\..\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-=======
-      <AdditionalIncludeDirectories>".";"..\lib";"..\externals\tinyxml";c:\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
->>>>>>> 8e379f65ec6b29de134be4013536fafe4d760a1c:cli/cppcheck.vcxproj
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -197,4 +193,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

test/test.pro

@@ -1,75 +1,81 @@
-
+
-TEMPLATE = app
+TEMPLATE = app
-TARGET = test
+TARGET = test
-DEPENDPATH += .
+DEPENDPATH += .
-TINYXML_DIR = ../externals/tinyxml/
+INCLUDEPATH += . ../cli ../lib
-INCLUDEPATH += . ../cli ../lib $${TINYXML_DIR}
+OBJECTS_DIR = temp
-OBJECTS_DIR = temp
+CONFIG += warn_on console
-CONFIG += warn_on console
+CONFIG -= qt app_bundle
-CONFIG -= qt app_bundle
+win32 {
-win32 {
+    LIBS += -lshlwapi
-    LIBS += -lshlwapi
-}
-
-BASEPATH = $${TINYXML_DIR}
-include($${TINYXML_DIR}tinyxml.pri)
-BASEPATH = ../lib/
-include(../lib/lib.pri)
-
-# cli/*
-SOURCES += ../cli/cmdlineparser.cpp \
-           ../cli/cppcheckexecutor.cpp \
-           ../cli/filelister.cpp \
-           ../cli/filelister_unix.cpp \
-           ../cli/filelister_win32.cpp \
-           ../cli/threadexecutor.cpp
-HEADERS += ../cli/cmdlineparser.h \
-           ../cli/cppcheckexecutor.h \
-           ../cli/filelister.h \
-           ../cli/filelister_unix.h \
-           ../cli/filelister_win32.h \
-           ../cli/threadexecutor.h
-
-# test/*
-HEADERS += options.h redirect.h testsuite.h
-SOURCES += 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 \
-           testrunner.cpp \
-           testsettings.cpp \
-           testsimplifytokens.cpp \
-           teststl.cpp \
-           testsuite.cpp \
-           testthreadexecutor.cpp \
-           testtoken.cpp \
-           testtokenize.cpp \
-           testuninitvar.cpp \
-           testunusedfunctions.cpp \
-           testunusedprivfunc.cpp \
-           testunusedvar.cpp
-
-# Change Visual Studio compiler (CL) warning level to W4
-contains(QMAKE_CXX, cl) {
-    QMAKE_CXXFLAGS_WARN_ON -= -W3
-    QMAKE_CXXFLAGS_WARN_ON += -W4
-    DEFINES += _CRT_SECURE_NO_WARNINGS
 }
 
+BASEPATH = ../externals/tinyxml/
+include(../externals/tinyxml/tinyxml.pri)
+BASEPATH = ../lib/
+include(../lib/lib.pri)
+
+# cli/*
+SOURCES += ../cli/cmdlineparser.cpp \
+           ../cli/cppcheckexecutor.cpp \
+           ../cli/filelister.cpp \
+           ../cli/pathmatch.cpp \
+           ../cli/threadexecutor.cpp \
+    testpathmatch.cpp
+HEADERS += ../cli/cmdlineparser.h \
+           ../cli/cppcheckexecutor.h \
+           ../cli/filelister.h \
+           ../cli/pathmatch.h \
+           ../cli/threadexecutor.h
+
+# test/*
+
+# Note:
+# testfilelister_unix.cpp omitted since there is test fail when run in QtCreator
+# Test assumes the test (executable) is built from the test directory (or
+# directory containing source files). But QtCreator builds to separate build
+# directory. Hence the test does not find the source files.
+
+HEADERS += options.h redirect.h testsuite.h
+SOURCES += 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 \
+           testpathmatch.cpp \
+           testpostfixoperator.cpp \
+           testpreprocessor.cpp \
+           testrunner.cpp \
+           testsettings.cpp \
+           testsimplifytokens.cpp \
+           teststl.cpp \
+           testsuite.cpp \
+           testsymboldatabase.cpp \
+           testthreadexecutor.cpp \
+           testtoken.cpp \
+           testtokenize.cpp \
+           testuninitvar.cpp \
+           testunusedfunctions.cpp \
+           testunusedprivfunc.cpp \
+           testunusedvar.cpp
+
+# Change Visual Studio compiler (CL) warning level to W4
+contains(QMAKE_CXX, cl) {
+    QMAKE_CXXFLAGS_WARN_ON -= -W3
+    QMAKE_CXXFLAGS_WARN_ON += -W4
+    DEFINES += _CRT_SECURE_NO_WARNINGS
+}

test/test.vcproj

@@ -19,7 +19,7 @@
 			UseOfMfc="0">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\cli&quot;,&quot;..\lib&quot;,&quot;..\externals\tinyxml&quot;,c:\Qt\VS4.7.0\mkspecs\win32-msvc2008"
+				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\cli&quot;,&quot;..\lib&quot;,&quot;..\externals&quot;,&quot;..\externals\tinyxml&quot;,..\..\Qt\VS4.7.0\mkspecs\win32-msvc2008"
 				AdditionalOptions="-Zm200 -w34100 -w34189"
 				AssemblerListingLocation="temp\"
 				BufferSecurityCheck="false"
@@ -72,11 +72,7 @@
 			UseOfMfc="0">
 			<Tool
 				Name="VCCLCompilerTool"
-<<<<<<< HEAD:test/test.vcproj
 				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\cli&quot;,&quot;..\lib&quot;,&quot;..\externals&quot;,&quot;..\externals\tinyxml&quot;,..\..\Qt\VS4.7.0\mkspecs\win32-msvc2008"
-=======
-				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\cli&quot;,&quot;..\lib&quot;,&quot;..\externals\tinyxml&quot;,c:\Qt\VS4.7.0\mkspecs\win32-msvc2008"
->>>>>>> 8e379f65ec6b29de134be4013536fafe4d760a1c:test/test.vcproj
 				AdditionalOptions="-Zm200 -w34100 -w34189"
 				AssemblerListingLocation="temp\"
 				BufferSecurityCheck="false"
@@ -338,4 +334,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

test/test.vcxproj

@@ -50,7 +50,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Debug|Win32&apos;">
     <ClCompile>
-      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals\tinyxml";c:\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals";"..\externals\tinyxml";..\..\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -84,11 +84,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;Release|Win32&apos;">
     <ClCompile>
-<<<<<<< HEAD:test/test.vcxproj
       <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals";"..\externals\tinyxml";..\..\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-=======
-      <AdditionalIncludeDirectories>".";"..\cli";"..\lib";"..\externals\tinyxml";c:\Qt\VS4.7.0\mkspecs\win32-msvc2010;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
->>>>>>> 8e379f65ec6b29de134be4013536fafe4d760a1c:test/test.vcxproj
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <AssemblerListingLocation>temp\</AssemblerListingLocation>
       <BrowseInformation>false</BrowseInformation>
@@ -227,4 +223,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

test/testcppcheck.cpp

@@ -32,11 +32,7 @@
 #include <stdexcept>
 
 // use tinyxml with STL
-<<<<<<< HEAD:test/testcppcheck.cpp
 #include <tinyxml.h>
-=======
-#include "tinyxml.h"
->>>>>>> 8e379f65ec6b29de134be4013536fafe4d760a1c:test/testcppcheck.cpp
 
 extern std::ostringstream errout;
 extern std::ostringstream output;

tools/dmake.cpp

@@ -301,9 +301,9 @@ int main(int argc, char **argv)
 
     fout << "\n###### Build\n\n";
 
-    compilefiles(fout, libfiles, "-Ilib");
+    compilefiles(fout, libfiles, "${INCLUDE_FOR_LIB}");
-    compilefiles(fout, clifiles, "-Ilib -Iexternals/tinyxml -Iexternals");
+    compilefiles(fout, clifiles, "${INCLUDE_FOR_CLI}");
-    compilefiles(fout, testfiles, "-Ilib -Icli -Iexternals/tinyxml -Iexternals");
+    compilefiles(fout, testfiles, "${INCLUDE_FOR_TEST}");
 
     return 0;
 }