8000 Merge pull request #35 from pjohnmeyer/master · unittest-cpp/unittest-cpp@5caa826 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5caa826

Browse files
pjohnmeyerpjohnmeyer
committed
Merge pull request #35 from pjohnmeyer/master
Visual Studio 2003, 2005, 2008, 2010, 2012 support
2 parents c13d247 + d761d7d commit 5caa826

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6487
-1489
lines changed

‎.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
*.sln text eol=crlf
88
*.vcproj text eol=crlf
99
*.vcxproj text eol=crlf
10+
*.vcxproj.filters text eol=crlf
1011

1112
# VC6 files
1213
*.dsw text eol=crlf
1314
*.dsp text eol=crlf
15+
16+
# Other 'windows-specific' files
17+
*.bat text eol=crlf

‎.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
*.o
22
*.a
3+
4+
# Visual Studio temp/user files
35
*.user
46
*.suo
57
*.sdf
68
*.opensdf
9+
*.ncb
10+
11+
# Build output directories
712
Release
813
Debug
14+
MinSizeRel
15+
RelWithDebInfo
916
ipch

‎CMakeLists.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ source_group("" FILES ${headers_} ${sources_})
1010

1111
# get platform specific sources
1212
if (WIN32)
13+
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
1314
set(platformDir_ Win32)
1415
else()
1516
set(platformDir_ Posix)
@@ -20,32 +21,32 @@ file(GLOB platformSources_ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} UnitTest++/${pla
2021
source_group(${platformDir_} FILES ${platformHeaders_} ${platformSources_})
2122

2223
# create the lib
23-
add_library(UnitTestPP STATIC ${headers_} ${sources_} ${platformHeaders_} ${platformSources_})
24+
add_library(UnitTest++ STATIC ${headers_} ${sources_} ${platformHeaders_} ${platformSources_})
2425

2526
if(${UTPP_USE_PLUS_SIGN})
26-
set_target_properties(UnitTestPP PROPERTIES OUTPUT_NAME UnitTest++)
27+
set_target_properties(UnitTest++ PROPERTIES OUTPUT_NAME UnitTest++)
2728
endif()
2829

2930

3031
# build the test runner
3132
file(GLOB TEST_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tests/*.cpp tests/*.h)
3233
source_group( "" FILES ${TEST_SRCS})
33-
add_executable(TestUnitTestPP ${TEST_SRCS})
34+
add_executable(TestUnitTest++ ${TEST_SRCS})
3435
include_directories(.)
3536

3637
if(${UTPP_USE_PLUS_SIGN})
37-
set_target_properties(TestUnitTestPP PROPERTIES OUTPUT_NAME TestUnitTest++)
38+
set_target_properties(TestUnitTest++ PROPERTIES OUTPUT_NAME TestUnitTest++)
3839
endif()
3940

40-
target_link_libraries(TestUnitTestPP UnitTestPP)
41+
target_link_libraries(TestUnitTest++ UnitTest++)
4142

4243
# turn on testing
4344
enable_testing()
4445
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -V)
4546

4647
# add the test runner as a test
47-
add_test(NAME TestUnitTestPP COMMAND TestUnitTest++ ${CONFIG_PATH} ${CONFIG_TASKS_PATH} ${SOUND_LOG_PATH})
48-
add_dependencies(check TestUnitTestPP)
48+
add_test(NAME TestUnitTest++ COMMAND TestUnitTest++ ${CONFIG_PATH} ${CONFIG_TASKS_PATH} ${SOUND_LOG_PATH})
49+
add_dependencies(check TestUnitTest++)
4950

5051

5152
# add install targets
@@ -57,6 +58,6 @@ else()
5758
set (UTPP_INSTALL_DESTINATION "include/UnitTestPP")
5859
endif()
5960

60-
install(TARGETS UnitTestPP DESTINATION lib)
61+
install(TARGETS UnitTest++ DESTINATION lib)
6162
install(FILES ${headers_} DESTINATION ${UTPP_INSTALL_DESTINATION})
6263
install(FILES ${platformHeaders_} DESTINATION ${UTPP_INSTALL_DESTINATION}/${platformDir_})

‎TestUnitTest++.vsnet2003.vcproj

Lines changed: 0 additions & 174 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0