diff --git a/.gitignore b/.gitignore index 605b4a3..7a4f8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.exe *.dll +*.opendb *.opensdf *.sdf *.suo diff --git a/MUtilities_VS2015.sln b/MUtilities_VS2015.sln index 06fecd6..7446d8e 100644 --- a/MUtilities_VS2015.sln +++ b/MUtilities_VS2015.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilities", "MUtilities_VS2015.vcxproj", "{55405FE1-149F-434C-9D72-4B64348D2A08}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilitiesTest_VS2015", "test\MUtilitiesTest_VS2015.vcxproj", "{B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -18,6 +20,12 @@ Global {55405FE1-149F-434C-9D72-4B64348D2A08}.Release_Static|Win32.Build.0 = Release_Static|Win32 {55405FE1-149F-434C-9D72-4B64348D2A08}.Release|Win32.ActiveCfg = Release|Win32 {55405FE1-149F-434C-9D72-4B64348D2A08}.Release|Win32.Build.0 = Release|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Debug|Win32.Build.0 = Debug|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release|Win32.ActiveCfg = Release|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/test/MUtilitiesTest_VS2015.vcxproj b/test/MUtilitiesTest_VS2015.vcxproj new file mode 100644 index 0000000..4d5529b --- /dev/null +++ b/test/MUtilitiesTest_VS2015.vcxproj @@ -0,0 +1,151 @@ + + + + + Debug + Win32 + + + Release_Static + Win32 + + + Release + Win32 + + + + + + + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89} + Win32Proj + MUtilitiesTest_VS2015 + 8.1 + MUtilitiesTest + + + + Application + true + v140_xp + Unicode + + + Application + false + v140_xp + true + Unicode + + + Application + false + v140_xp + true + Unicode + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + false + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + false + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\Prerequisites\GoogleTest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + NoExtensions + + + Console + true + $(SolutionDir)\..\Prerequisites\GoogleTest\$(PlatformToolset)\Debug;%(AdditionalLibraryDirectories) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + + + Full + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\Prerequisites\GoogleTest\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + NoExtensions + false + AnySuitable + Speed + true + + + Console + true + true + true + $(SolutionDir)\..\Prerequisites\GoogleTest\$(PlatformToolset)\Shared;%(AdditionalLibraryDirectories) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + + + Full + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\Prerequisites\GoogleTest\include;%(AdditionalIncludeDirectories) + MultiThreaded + NoExtensions + false + AnySuitable + Speed + true + + + Console + true + true + true + $(SolutionDir)\..\Prerequisites\GoogleTest\lib\$(PlatformToolset)\Static;%(AdditionalLibraryDirectories) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/test/MUtilitiesTest_VS2015.vcxproj.filters b/test/MUtilitiesTest_VS2015.vcxproj.filters new file mode 100644 index 0000000..40c72c3 --- /dev/null +++ b/test/MUtilitiesTest_VS2015.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/test/src/MUtilitiesTest.cpp b/test/src/MUtilitiesTest.cpp new file mode 100644 index 0000000..db3c6f1 --- /dev/null +++ b/test/src/MUtilitiesTest.cpp @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////// +// MuldeR's Utilities for Qt +// Copyright (C) 2004-2016 LoRd_MuldeR +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// +// http://www.gnu.org/licenses/lgpl-2.1.txt +////////////////////////////////////////////////////////////////////////////////// + +#include + +TEST(FactorialTest, Zero) { + EXPECT_EQ(1, 1); +} + +//MAIN +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +}