10000 Visual Studio 2003, 2005, 2008, 2010, 2012 support by pjohnmeyer · Pull Request #35 · unittest-cpp/unittest-cpp · GitHub
[go: up one dir, main page]
Skip to content

Visual Studio 2003, 2005, 2008, 2010, 2012 support #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 24, 2013
Merged

Visual Studio 2003, 2005, 2008, 2010, 2012 support #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3a12a31
Add support and project files for Visual Studio 2012
pjohnmeyer Mar 24, 2013
49f6d85
Add *.bat as eol=crlf.
pjohnmeyer Mar 24, 2013
6c1c587
Add strip_cmake.bat for deleting "extra" files generated by CMake.
pjohnmeyer Mar 24, 2013
5b363d9
Generate new Visual Studio 2010 projects.
pjohnmeyer Mar 24, 2013
87b0e15
Generate new Visual Studio 2008 projects.
pjohnmeyer Mar 24, 2013
ed6d924
Remove old TestUnitTest++ 2010 project files.
pjohnmeyer Mar 24, 2013
f79e71a
Generate new Visual Studio 2005 projects.
pjohnmeyer Mar 24, 2013
44fb013
Remove old Visual Studio 2005 projects.
pjohnmeyer Mar 24, 2013
4a466f8
Generate new Visual Studio 2003 projects.
pjohnmeyer Mar 24, 2013
6daa0b3
Remove missed Visual Studio 2005 file.
pjohnmeyer Mar 24, 2013
f74f15e
Remove old Visual Studio 2003 project files.
pjohnmeyer Mar 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
*.sln text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf

# VC6 files
*.dsw text eol=crlf
*.dsp text eol=crlf

# Other 'windows-specific' files
*.bat text eol=crlf
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
*.o
*.a

# Visual Studio temp/user files
*.user
*.suo
*.sdf
*.opensdf
*.ncb

# Build output directories
Release
Debug
MinSizeRel
RelWithDebInfo
ipch
17 changes: 9 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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_})
174 changes: 0 additions & 174 deletions TestUnitTest++.vsnet2003.vcproj
View file
Open in desktop

This file was deleted.

Loading
0