v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebase to master

pull/366/head
Jared Duke 2014-09-05 20:42:45 -07:00
parent 8d77a47304
commit a8deb121e4
1 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/CMakeLists.txt
View File

@ -16,9 +16,9 @@ SOURCE_GROUP( unit FILES
) )
if(WIN32) if(WIN32)
# cpppunit provides configuration headers for MSVC. Other plaforms require # cpppunit provides configuration headers for MSVC. Other compilers require
# explicit creation at configure time. # explicit header creation at configure time.
if(NOT MSVC) if(NOT MSVC)
# Generates include/cppunit/config-auto.h # Generates include/cppunit/config-auto.h
# This is originally done by autoconf # This is originally done by autoconf
@ -119,9 +119,9 @@ if(NOT MSVC)
#Not used STDC_HEADERS #Not used STDC_HEADERS
check_include_file_cxx(typeinfo CPPUNIT_USE_TYPEINFO_NAME) check_include_file_cxx(typeinfo CPPUNIT_USE_TYPEINFO_NAME)
configure_file(unit/cppunit-config/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/cppunit-1.12.1/include/cppunit/config-auto.h) configure_file(unit/cppunit-config/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/cppunit-1.12.1/include/cppunit/config-auto.h)
endif() endif()
SET( CPPUNIT_SRCS SET( CPPUNIT_SRCS
../contrib/cppunit-1.12.1/src/cppunit/AdditionalMessage.cpp ../contrib/cppunit-1.12.1/src/cppunit/AdditionalMessage.cpp
../contrib/cppunit-1.12.1/src/cppunit/Asserter.cpp ../contrib/cppunit-1.12.1/src/cppunit/Asserter.cpp
../contrib/cppunit-1.12.1/src/cppunit/BeOsDynamicLibraryManager.cpp ../contrib/cppunit-1.12.1/src/cppunit/BeOsDynamicLibraryManager.cpp
@ -175,8 +175,8 @@ SET( CPPUNIT_SRCS
../contrib/cppunit-1.12.1/src/cppunit/XmlElement.cpp ../contrib/cppunit-1.12.1/src/cppunit/XmlElement.cpp
../contrib/cppunit-1.12.1/src/cppunit/XmlOutputter.cpp ../contrib/cppunit-1.12.1/src/cppunit/XmlOutputter.cpp
../contrib/cppunit-1.12.1/src/cppunit/XmlOutputterHook.cpp ../contrib/cppunit-1.12.1/src/cppunit/XmlOutputterHook.cpp
) )
SOURCE_GROUP(cppunit FILES ${CPPUNIT_SRCS}) SOURCE_GROUP(cppunit FILES ${CPPUNIT_SRCS})
else() else()
find_library(CPPUNIT_LIBRARY cppunit) find_library(CPPUNIT_LIBRARY cppunit)
endif() endif()