From ce196f218a59a9440463f510ed9d97ba7d8a6c88 Mon Sep 17 00:00:00 2001 From: Patrick Johnmeyer Date: Sun, 24 Mar 2013 01:13:10 -0500 Subject: [PATCH] Add support and project files for Visual Studio 2012 --- .gitattributes | 1 + .gitignore | 4 + CMakeLists.txt | 17 +- tests/TestTest.cpp | 3 +- vs_projects/vs2012_x64/TestUnitTest++.vcxproj | 299 +++++++++++++++++ .../vs2012_x64/TestUnitTest++.vcxproj.filters | 30 ++ vs_projects/vs2012_x64/UnitTest++.sln | 38 +++ vs_projects/vs2012_x64/UnitTest++.vcxproj | 256 +++++++++++++++ .../vs2012_x64/UnitTest++.vcxproj.filters | 63 ++++ vs_projects/vs2012_x86/TestUnitTest++.vcxproj | 306 ++++++++++++++++++ .../vs2012_x86/TestUnitTest++.vcxproj.filters | 30 ++ vs_projects/vs2012_x86/UnitTest++.sln | 38 +++ vs_projects/vs2012_x86/UnitTest++.vcxproj | 256 +++++++++++++++ .../vs2012_x86/UnitTest++.vcxproj.filters | 63 ++++ 14 files changed, 1395 insertions(+), 9 deletions(-) create mode 100644 vs_projects/vs2012_x64/TestUnitTest++.vcxproj create mode 100644 vs_projects/vs2012_x64/TestUnitTest++.vcxproj.filters create mode 100644 vs_projects/vs2012_x64/UnitTest++.sln create mode 100644 vs_projects/vs2012_x64/UnitTest++.vcxproj create mode 100644 vs_projects/vs2012_x64/UnitTest++.vcxproj.filters create mode 100644 vs_projects/vs2012_x86/TestUnitTest++.vcxproj create mode 100644 vs_projects/vs2012_x86/TestUnitTest++.vcxproj.filters create mode 100644 vs_projects/vs2012_x86/UnitTest++.sln create mode 100644 vs_projects/vs2012_x86/UnitTest++.vcxproj create mode 100644 vs_projects/vs2012_x86/UnitTest++.vcxproj.filters diff --git a/.gitattributes b/.gitattributes index 615713b..ce46819 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,6 +7,7 @@ *.sln text eol=crlf *.vcproj text eol=crlf *.vcxproj text eol=crlf +*.vcxproj.filters text eol=crlf # VC6 files *.dsw text eol=crlf diff --git a/.gitignore b/.gitignore index 23d7021..397bce8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,10 @@ *.suo *.sdf *.opensdf + +# Build output directories Release Debug +MinSizeRel +RelWithDebInfo ipch \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index ce5af75..7b2482d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ source_group("" FILES ${headers_} ${sources_}) # get platform specific sources if (WIN32) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) set(platformDir_ Win32) else() set(platformDir_ Posix) @@ -20,32 +21,32 @@ file(GLOB platformSources_ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} UnitTest++/${pla source_group(${platformDir_} FILES ${platformHeaders_} ${platformSources_}) # create the lib -add_library(UnitTestPP STATIC ${headers_} ${sources_} ${platformHeaders_} ${platformSources_}) +add_library(UnitTest++ STATIC ${headers_} ${sources_} ${platformHeaders_} ${platformSources_}) if(${UTPP_USE_PLUS_SIGN}) - set_target_properties(UnitTestPP PROPERTIES OUTPUT_NAME UnitTest++) + set_target_properties(UnitTest++ PROPERTIES OUTPUT_NAME UnitTest++) endif() # build the test runner file(GLOB TEST_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tests/*.cpp tests/*.h) source_group( "" FILES ${TEST_SRCS}) -add_executable(TestUnitTestPP ${TEST_SRCS}) +add_executable(TestUnitTest++ ${TEST_SRCS}) include_directories(.) if(${UTPP_USE_PLUS_SIGN}) - set_target_properties(TestUnitTestPP PROPERTIES OUTPUT_NAME TestUnitTest++) + set_target_properties(TestUnitTest++ PROPERTIES OUTPUT_NAME TestUnitTest++) endif() -target_link_libraries(TestUnitTestPP UnitTestPP) +target_link_libraries(TestUnitTest++ UnitTest++) # turn on testing enable_testing() add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -V) # add the test runner as a test -add_test(NAME TestUnitTestPP COMMAND TestUnitTest++ ${CONFIG_PATH} ${CONFIG_TASKS_PATH} ${SOUND_LOG_PATH}) -add_dependencies(check TestUnitTestPP) +add_test(NAME TestUnitTest++ COMMAND TestUnitTest++ ${CONFIG_PATH} ${CONFIG_TASKS_PATH} ${SOUND_LOG_PATH}) +add_dependencies(check TestUnitTest++) # add install targets @@ -57,6 +58,6 @@ else() set (UTPP_INSTALL_DESTINATION "include/UnitTestPP") endif() -install(TARGETS UnitTestPP DESTINATION lib) +install(TARGETS UnitTest++ DESTINATION lib) install(FILES ${headers_} DESTINATION ${UTPP_INSTALL_DESTINATION}) install(FILES ${platformHeaders_} DESTINATION ${UTPP_INSTALL_DESTINATION}/${platformDir_}) \ No newline at end of file diff --git a/tests/TestTest.cpp b/tests/TestTest.cpp index 2aeab6d..5c4f358 100644 --- a/tests/TestTest.cpp +++ b/tests/TestTest.cpp @@ -72,7 +72,7 @@ TEST(ThrowingTestsAreReportedAsFailures) CHECK_EQUAL(1, results.GetFailureCount()); } -#ifndef UNITTEST_MINGW +#if !defined(UNITTEST_MINGW) && !defined(UNITTEST_WIN32) TEST(CrashingTestsAreReportedAsFailures) { class CrashingTest : public Test @@ -81,6 +81,7 @@ TEST(CrashingTestsAreReportedAsFailures) CrashingTest() : Test("crashing") {} virtual void RunImpl() const { + reinterpret_cast< void (*)() >(0)(); } }; diff --git a/vs_projects/vs2012_x64/TestUnitTest++.vcxproj b/vs_projects/vs2012_x64/TestUnitTest++.vcxproj new file mode 100644 index 0000000..17aef9f --- /dev/null +++ b/vs_projects/vs2012_x64/TestUnitTest++.vcxproj @@ -0,0 +1,299 @@ + + + + + Debug + x64 + + + Release + x64 + + + MinSizeRel + x64 + + + RelWithDebInfo + x64 + + + + {FAE7B8C1-428D-45DB-9A26-751A64C666D1} + Win32Proj + x64 + TestUnitTest++ + + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + U:\unittest-cpp-pj\vs_projects\vs2012_x64\Debug\ + TestUnitTest++.dir\Debug\ + TestUnitTest++ + .exe + true + true + U:\unittest-cpp-pj\vs_projects\vs2012_x64\Release\ + TestUnitTest++.dir\Release\ + TestUnitTest++ + .exe + false + true + U:\unittest-cpp-pj\vs_projects\vs2012_x64\MinSizeRel\ + TestUnitTest++.dir\MinSizeRel\ + TestUnitTest++ + .exe + false + true + U:\unittest-cpp-pj\vs_projects\vs2012_x64\RelWithDebInfo\ + TestUnitTest++.dir\RelWithDebInfo\ + TestUnitTest++ + .exe + true + true + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Debug/TestUnitTest++.pdb + + + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:x64 /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Debug\UnitTest++.lib + %(AdditionalLibraryDirectories) + true + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Debug/TestUnitTest++.lib + true + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Debug/TestUnitTest++.pdb + 10000000 + Console + + + + false + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Release/TestUnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:x64 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Release\UnitTest++.lib + %(AdditionalLibraryDirectories) + false + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Release/TestUnitTest++.lib + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Release/TestUnitTest++.pdb + 10000000 + Console + + + + false + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + Level3 + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + MinSizeRel + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/MinSizeRel/TestUnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:x64 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;MinSizeRel\UnitTest++.lib + %(AdditionalLibraryDirectories) + false + U:/unittest-cpp-pj/vs_projects/vs2012_x64/MinSizeRel/TestUnitTest++.lib + U:/unittest-cpp-pj/vs_projects/vs2012_x64/MinSizeRel/TestUnitTest++.pdb + 10000000 + Console + + + + false + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + RelWithDebInfo + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/RelWithDebInfo/TestUnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:x64 /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;RelWithDebInfo\UnitTest++.lib + %(AdditionalLibraryDirectories) + true + U:/unittest-cpp-pj/vs_projects/vs2012_x64/RelWithDebInfo/TestUnitTest++.lib + true + U:/unittest-cpp-pj/vs_projects/vs2012_x64/RelWithDebInfo/TestUnitTest++.pdb + 10000000 + Console + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + 7867CF0A-53DE-4CAD-A141-976283C590C4 + + + + + + \ No newline at end of file diff --git a/vs_projects/vs2012_x64/TestUnitTest++.vcxproj.filters b/vs_projects/vs2012_x64/TestUnitTest++.vcxproj.filters new file mode 100644 index 0000000..3cfece1 --- /dev/null +++ b/vs_projects/vs2012_x64/TestUnitTest++.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs_projects/vs2012_x64/UnitTest++.sln b/vs_projects/vs2012_x64/UnitTest++.sln new file mode 100644 index 0000000..43e350c --- /dev/null +++ b/vs_projects/vs2012_x64/UnitTest++.sln @@ -0,0 +1,38 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestUnitTest++", "TestUnitTest++.vcxproj", "{FAE7B8C1-428D-45DB-9A26-751A64C666D1}" + ProjectSection(ProjectDependencies) = postProject + {7867CF0A-53DE-4CAD-A141-976283C590C4} = {7867CF0A-53DE-4CAD-A141-976283C590C4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest++", "UnitTest++.vcxproj", "{7867CF0A-53DE-4CAD-A141-976283C590C4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + MinSizeRel|x64 = MinSizeRel|x64 + Release|x64 = Release|x64 + RelWithDebInfo|x64 = RelWithDebInfo|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.Debug|x64.ActiveCfg = Debug|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.Debug|x64.Build.0 = Debug|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.Release|x64.ActiveCfg = Release|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.Release|x64.Build.0 = Release|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {FAE7B8C1-428D-45DB-9A26-751A64C666D1}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.Debug|x64.ActiveCfg = Debug|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.Debug|x64.Build.0 = Debug|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.Release|x64.ActiveCfg = Release|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.Release|x64.Build.0 = Release|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {7867CF0A-53DE-4CAD-A141-976283C590C4}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vs_projects/vs2012_x64/UnitTest++.vcxproj b/vs_projects/vs2012_x64/UnitTest++.vcxproj new file mode 100644 index 0000000..7ea763f --- /dev/null +++ b/vs_projects/vs2012_x64/UnitTest++.vcxproj @@ -0,0 +1,256 @@ + + + + + Debug + x64 + + + Release + x64 + + + MinSizeRel + x64 + + + RelWithDebInfo + x64 + + + + {7867CF0A-53DE-4CAD-A141-976283C590C4} + Win32Proj + x64 + UnitTest++ + + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + U:\unittest-cpp-pj\vs_projects\vs2012_x64\Debug\ + UnitTest++.dir\Debug\ + UnitTest++ + .lib + U:\unittest-cpp-pj\vs_projects\vs2012_x64\Release\ + UnitTest++.dir\Release\ + UnitTest++ + .lib + U:\unittest-cpp-pj\vs_projects\vs2012_x64\MinSizeRel\ + UnitTest++.dir\MinSizeRel\ + UnitTest++ + .lib + U:\unittest-cpp-pj\vs_projects\vs2012_x64\RelWithDebInfo\ + UnitTest++.dir\RelWithDebInfo\ + UnitTest++ + .lib + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Debug/UnitTest++.pdb + + + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/Release/UnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + Level3 + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + MinSizeRel + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/MinSizeRel/UnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + RelWithDebInfo + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x64/RelWithDebInfo/UnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vs_projects/vs2012_x64/UnitTest++.vcxproj.filters b/vs_projects/vs2012_x64/UnitTest++.vcxproj.filters new file mode 100644 index 0000000..b692ccf --- /dev/null +++ b/vs_projects/vs2012_x64/UnitTest++.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Win32 + + + + + {6C3785C9-4B23-45F4-871B-C1DD411A4396} + + + diff --git a/vs_projects/vs2012_x86/TestUnitTest++.vcxproj b/vs_projects/vs2012_x86/TestUnitTest++.vcxproj new file mode 100644 index 0000000..f12b1da --- /dev/null +++ b/vs_projects/vs2012_x86/TestUnitTest++.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + MinSizeRel + Win32 + + + RelWithDebInfo + Win32 + + + + {206E8A31-7D19-4632-A9A4-930039BB4A16} + Win32Proj + Win32 + TestUnitTest++ + + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + Application + false + MultiByte + v110 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + U:\unittest-cpp-pj\vs_projects\vs2012_x86\Debug\ + TestUnitTest++.dir\Debug\ + TestUnitTest++ + .exe + true + true + U:\unittest-cpp-pj\vs_projects\vs2012_x86\Release\ + TestUnitTest++.dir\Release\ + TestUnitTest++ + .exe + false + true + U:\unittest-cpp-pj\vs_projects\vs2012_x86\MinSizeRel\ + TestUnitTest++.dir\MinSizeRel\ + TestUnitTest++ + .exe + false + true + U:\unittest-cpp-pj\vs_projects\vs2012_x86\RelWithDebInfo\ + TestUnitTest++.dir\RelWithDebInfo\ + TestUnitTest++ + .exe + true + true + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Debug/TestUnitTest++.pdb + + + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:X86 /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Debug\UnitTest++.lib + %(AdditionalLibraryDirectories) + true + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Debug/TestUnitTest++.lib + true + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Debug/TestUnitTest++.pdb + 10000000 + Console + + + + + false + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Release/TestUnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:X86 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;Release\UnitTest++.lib + %(AdditionalLibraryDirectories) + false + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Release/TestUnitTest++.lib + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Release/TestUnitTest++.pdb + 10000000 + Console + + + + + false + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + Level3 + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + MinSizeRel + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/MinSizeRel/TestUnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:X86 %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;MinSizeRel\UnitTest++.lib + %(AdditionalLibraryDirectories) + false + U:/unittest-cpp-pj/vs_projects/vs2012_x86/MinSizeRel/TestUnitTest++.lib + U:/unittest-cpp-pj/vs_projects/vs2012_x86/MinSizeRel/TestUnitTest++.pdb + 10000000 + Console + + + + + false + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + RelWithDebInfo + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/RelWithDebInfo/TestUnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /machine:X86 /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;RelWithDebInfo\UnitTest++.lib + %(AdditionalLibraryDirectories) + true + U:/unittest-cpp-pj/vs_projects/vs2012_x86/RelWithDebInfo/TestUnitTest++.lib + true + U:/unittest-cpp-pj/vs_projects/vs2012_x86/RelWithDebInfo/TestUnitTest++.pdb + 10000000 + Console + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4128153F-6FD2-46E5-9330-3650015B97E1 + + + + + + \ No newline at end of file diff --git a/vs_projects/vs2012_x86/TestUnitTest++.vcxproj.filters b/vs_projects/vs2012_x86/TestUnitTest++.vcxproj.filters new file mode 100644 index 0000000..3cfece1 --- /dev/null +++ b/vs_projects/vs2012_x86/TestUnitTest++.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs_projects/vs2012_x86/UnitTest++.sln b/vs_projects/vs2012_x86/UnitTest++.sln new file mode 100644 index 0000000..466e16e --- /dev/null +++ b/vs_projects/vs2012_x86/UnitTest++.sln @@ -0,0 +1,38 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestUnitTest++", "TestUnitTest++.vcxproj", "{206E8A31-7D19-4632-A9A4-930039BB4A16}" + ProjectSection(ProjectDependencies) = postProject + {4128153F-6FD2-46E5-9330-3650015B97E1} = {4128153F-6FD2-46E5-9330-3650015B97E1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest++", "UnitTest++.vcxproj", "{4128153F-6FD2-46E5-9330-3650015B97E1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + MinSizeRel|Win32 = MinSizeRel|Win32 + Release|Win32 = Release|Win32 + RelWithDebInfo|Win32 = RelWithDebInfo|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {206E8A31-7D19-4632-A9A4-930039BB4A16}.Debug|Win32.ActiveCfg = Debug|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.Debug|Win32.Build.0 = Debug|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.Release|Win32.ActiveCfg = Release|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.Release|Win32.Build.0 = Release|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32 + {206E8A31-7D19-4632-A9A4-930039BB4A16}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.Debug|Win32.ActiveCfg = Debug|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.Debug|Win32.Build.0 = Debug|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.Release|Win32.ActiveCfg = Release|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.Release|Win32.Build.0 = Release|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32 + {4128153F-6FD2-46E5-9330-3650015B97E1}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vs_projects/vs2012_x86/UnitTest++.vcxproj b/vs_projects/vs2012_x86/UnitTest++.vcxproj new file mode 100644 index 0000000..471eaaa --- /dev/null +++ b/vs_projects/vs2012_x86/UnitTest++.vcxproj @@ -0,0 +1,256 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + MinSizeRel + Win32 + + + RelWithDebInfo + Win32 + + + + {4128153F-6FD2-46E5-9330-3650015B97E1} + Win32Proj + Win32 + UnitTest++ + + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + U:\unittest-cpp-pj\vs_projects\vs2012_x86\Debug\ + UnitTest++.dir\Debug\ + UnitTest++ + .lib + U:\unittest-cpp-pj\vs_projects\vs2012_x86\Release\ + UnitTest++.dir\Release\ + UnitTest++ + .lib + U:\unittest-cpp-pj\vs_projects\vs2012_x86\MinSizeRel\ + UnitTest++.dir\MinSizeRel\ + UnitTest++ + .lib + U:\unittest-cpp-pj\vs_projects\vs2012_x86\RelWithDebInfo\ + UnitTest++.dir\RelWithDebInfo\ + UnitTest++ + .lib + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Debug/UnitTest++.pdb + + + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/Release/UnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + OnlyExplicitInline + MinSpace + NotUsing + MultiThreadedDLL + true + Level3 + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + MinSizeRel + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/MinSizeRel/UnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + /Zm1000 %(AdditionalOptions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + Sync + OnlyExplicitInline + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + RelWithDebInfo + $(IntDir) + U:/unittest-cpp-pj/vs_projects/vs2012_x86/RelWithDebInfo/UnitTest++.pdb + + + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + + + U:/unittest-cpp-pj/.;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vs_projects/vs2012_x86/UnitTest++.vcxproj.filters b/vs_projects/vs2012_x86/UnitTest++.vcxproj.filters new file mode 100644 index 0000000..7818cf8 --- /dev/null +++ b/vs_projects/vs2012_x86/UnitTest++.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Win32 + + + + + {27C32F86-0D7D-4B85-AF93-E62D39E9D551} + + +