From da2be5445ca72d9c198dd6de91fb287da2783394 Mon Sep 17 00:00:00 2001 From: abma Date: Tue, 24 Jan 2017 02:37:10 +0100 Subject: more cleanup / compile some tests --- .travis.yml | 2 +- DevIL/CMakeLists.txt | 5 + DevIL/test/Benchmark/Benchmark.dsp | 96 ------------- DevIL/test/Benchmark/CMakeLists.txt | 2 + DevIL/test/CMakeLists.txt | 12 ++ DevIL/test/UnitTest/CMakeLists.txt | 7 + DevIL/test/UnitTest/ILTest.cpp | 5 +- DevIL/test/UnitTest/ReadMe.txt | 26 ---- DevIL/test/UnitTest/UnitTest.dsp | 124 ---------------- DevIL/test/UnitTest/UnitTest.dsw | 74 ---------- DevIL/test/UnitTest/UnitTest.sln | 57 -------- DevIL/test/UnitTest/UnitTest.vcproj | 216 ---------------------------- DevIL/test/UnitTest/cmake/Findcppunit.cmake | 75 ++++++++++ 13 files changed, 105 insertions(+), 596 deletions(-) delete mode 100644 DevIL/test/Benchmark/Benchmark.dsp create mode 100644 DevIL/test/Benchmark/CMakeLists.txt create mode 100644 DevIL/test/CMakeLists.txt create mode 100644 DevIL/test/UnitTest/CMakeLists.txt delete mode 100644 DevIL/test/UnitTest/ReadMe.txt delete mode 100644 DevIL/test/UnitTest/UnitTest.dsp delete mode 100644 DevIL/test/UnitTest/UnitTest.dsw delete mode 100644 DevIL/test/UnitTest/UnitTest.sln delete mode 100644 DevIL/test/UnitTest/UnitTest.vcproj create mode 100644 DevIL/test/UnitTest/cmake/Findcppunit.cmake diff --git a/.travis.yml b/.travis.yml index 61ef8e52..a083b5f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ before_script: - sudo apt-get install libpng12-dev zlib1g-dev libjpeg-dev libtiff4-dev libmng-dev libjasper-dev liblcms1-dev freeglut3-dev libsdl1.2-dev liblcms2-dev script: - cmake DevIL - - make all + - make all UnitTest benchmark diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt index a26f8eac..e342f93d 100644 --- a/DevIL/CMakeLists.txt +++ b/DevIL/CMakeLists.txt @@ -7,4 +7,9 @@ set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") add_subdirectory(src-IL) add_subdirectory(src-ILU) add_subdirectory(src-ILUT) +option(IL_TESTS "build DevIL tests" ON) +if (IL_TESTS) + ENABLE_TESTING() + Add_Subdirectory(test) +endif() diff --git a/DevIL/test/Benchmark/Benchmark.dsp b/DevIL/test/Benchmark/Benchmark.dsp deleted file mode 100644 index 9366b69a..00000000 --- a/DevIL/test/Benchmark/Benchmark.dsp +++ /dev/null @@ -1,96 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Benchmark" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Benchmark - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Benchmark.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Benchmark.mak" CFG="Benchmark - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Benchmark - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Benchmark - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Benchmark - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\bin" -# PROP Intermediate_Dir "obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386 - -!ELSEIF "$(CFG)" == "Benchmark - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\bin\debug" -# PROP Intermediate_Dir "obj/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 - -!ENDIF - -# Begin Target - -# Name "Benchmark - Win32 Release" -# Name "Benchmark - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\benchmark.c -# End Source File -# End Group -# End Target -# End Project diff --git a/DevIL/test/Benchmark/CMakeLists.txt b/DevIL/test/Benchmark/CMakeLists.txt new file mode 100644 index 00000000..f2277402 --- /dev/null +++ b/DevIL/test/Benchmark/CMakeLists.txt @@ -0,0 +1,2 @@ +add_executable(benchmark EXCLUDE_FROM_ALL benchmark.c) +target_link_libraries(benchmark IL ILU) diff --git a/DevIL/test/CMakeLists.txt b/DevIL/test/CMakeLists.txt new file mode 100644 index 00000000..1b91e06d --- /dev/null +++ b/DevIL/test/CMakeLists.txt @@ -0,0 +1,12 @@ +add_subdirectory(Benchmark) +add_subdirectory(UnitTest) +# TODO +#add_subdirectory(DDrawTest) +#add_subdirectory(Fltk) +#add_subdirectory(format_test) +#add_subdirectory(MdiTest) +#add_subdirectory(old) +#add_subdirectory(Stress) +#add_subdirectory(Unzip) +#add_subdirectory(URar) +#add_subdirectory(VolTex) diff --git a/DevIL/test/UnitTest/CMakeLists.txt b/DevIL/test/UnitTest/CMakeLists.txt new file mode 100644 index 00000000..da14ed81 --- /dev/null +++ b/DevIL/test/UnitTest/CMakeLists.txt @@ -0,0 +1,7 @@ + +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +find_package(cppunit) +add_executable(UnitTest EXCLUDE_FROM_ALL ILTest.cpp ILUTest.cpp UnitTest.cpp) +target_include_directories(UnitTest PRIVATE ${cppunit_INCLUDE_DIRECTORIES}) +target_link_libraries(UnitTest IL ILU ${CPPUNIT_LIBRARIES}) diff --git a/DevIL/test/UnitTest/ILTest.cpp b/DevIL/test/UnitTest/ILTest.cpp index bedd556a..179061bf 100644 --- a/DevIL/test/UnitTest/ILTest.cpp +++ b/DevIL/test/UnitTest/ILTest.cpp @@ -13,6 +13,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( ILTest ); #include #include #include +#include void ILTest::setUp() { @@ -73,7 +74,7 @@ void ILTest::TestilActiveImage() { ilBindImage(MainImage); ilActiveImage(i); - itoa (i,lBuffer,10); + sprintf(lBuffer, "%d", i); lFinalFilename = lFilename + lBuffer + ".bmp"; FILE * lBuffer = fopen(lFinalFilename.c_str() , "wb"); CPPUNIT_ASSERT(lBuffer != NULL); @@ -203,4 +204,4 @@ void ILTest::TestilSaveF() ilLoadImage(".\\Data\\Logo.png"); ilSaveF(IL_BMP,lBuffer); fclose(lBuffer); -} \ No newline at end of file +} diff --git a/DevIL/test/UnitTest/ReadMe.txt b/DevIL/test/UnitTest/ReadMe.txt deleted file mode 100644 index 809282e7..00000000 --- a/DevIL/test/UnitTest/ReadMe.txt +++ /dev/null @@ -1,26 +0,0 @@ -======================================================================== - CONSOLE APPLICATION : UnitTest -======================================================================== - - -This file contains a summary of what you will find in each of the files that -make up your UnitTest application. - -UnitTest.dsp - This file (the project file) contains information at the project level and - is used to build a single project or subproject. Other users can share the - project (.dsp) file, but they should export the makefiles locally. - -UnitTest.cpp - This is the main application source file. - - -///////////////////////////////////////////////////////////////////////////// -This program allows to see how each interface method can be used in openIL - -NOTE: This program depends on cppunit, which can be found on Sourceforge.net. - Currently this test several routines in ILTest. - - It runs the test on the shell and reports its results. - - diff --git a/DevIL/test/UnitTest/UnitTest.dsp b/DevIL/test/UnitTest/UnitTest.dsp deleted file mode 100644 index 2a7a9f8b..00000000 --- a/DevIL/test/UnitTest/UnitTest.dsp +++ /dev/null @@ -1,124 +0,0 @@ -# Microsoft Developer Studio Project File - Name="UnitTest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=UnitTest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "UnitTest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "UnitTest.mak" CFG="UnitTest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "UnitTest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "UnitTest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "UnitTest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 cppunit.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "UnitTest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 cppunitd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "UnitTest - Win32 Release" -# Name "UnitTest - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ILTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\ILUTest.cpp -# End Source File -# Begin Source File - -SOURCE=.\UnitTest.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ILTest.h -# End Source File -# Begin Source File - -SOURCE=.\ILUTest.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/DevIL/test/UnitTest/UnitTest.dsw b/DevIL/test/UnitTest/UnitTest.dsw deleted file mode 100644 index a46b4b6a..00000000 --- a/DevIL/test/UnitTest/UnitTest.dsw +++ /dev/null @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "IL"="..\..\src-IL\msvc\IL.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ILU"="..\..\src-ILU\msvc\ILU.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ILUT"="..\..\src-ILUT\msvc\ILUT.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "UnitTest"=.\UnitTest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name IL - End Project Dependency - Begin Project Dependency - Project_Dep_Name ILU - End Project Dependency - Begin Project Dependency - Project_Dep_Name ILUT - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/DevIL/test/UnitTest/UnitTest.sln b/DevIL/test/UnitTest/UnitTest.sln deleted file mode 100644 index 2abe8801..00000000 --- a/DevIL/test/UnitTest/UnitTest.sln +++ /dev/null @@ -1,57 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest.vcproj", "{0034DB28-C836-4002-B277-5B7BCD9893CB}" - ProjectSection(ProjectDependencies) = postProject - {60313301-5E8F-4404-987F-CA8BAE815B1F} = {60313301-5E8F-4404-987F-CA8BAE815B1F} - {0F088168-B0B4-4350-9E6A-7FB271C76D39} = {0F088168-B0B4-4350-9E6A-7FB271C76D39} - {55B66AD7-F031-4B89-86DD-55E19636CB54} = {55B66AD7-F031-4B89-86DD-55E19636CB54} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL", "..\..\src-IL\msvc\IL.vcproj", "{0F088168-B0B4-4350-9E6A-7FB271C76D39}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILU", "..\..\src-ILU\msvc\ILU.vcproj", "{55B66AD7-F031-4B89-86DD-55E19636CB54}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILUT", "..\..\src-ILUT\msvc\ILUT.vcproj", "{60313301-5E8F-4404-987F-CA8BAE815B1F}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Dynamic = Dynamic - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {0034DB28-C836-4002-B277-5B7BCD9893CB}.Debug.ActiveCfg = Debug|Win32 - {0034DB28-C836-4002-B277-5B7BCD9893CB}.Debug.Build.0 = Debug|Win32 - {0034DB28-C836-4002-B277-5B7BCD9893CB}.Dynamic.ActiveCfg = Debug|Win32 - {0034DB28-C836-4002-B277-5B7BCD9893CB}.Dynamic.Build.0 = Debug|Win32 - {0034DB28-C836-4002-B277-5B7BCD9893CB}.Release.ActiveCfg = Release|Win32 - {0034DB28-C836-4002-B277-5B7BCD9893CB}.Release.Build.0 = Release|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Debug.ActiveCfg = Debug|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Debug.Build.0 = Debug|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Dynamic.ActiveCfg = Dynamic|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Dynamic.Build.0 = Dynamic|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Release.ActiveCfg = Release|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Release.Build.0 = Release|Win32 - {55B66AD7-F031-4B89-86DD-55E19636CB54}.Debug.ActiveCfg = Debug|Win32 - {55B66AD7-F031-4B89-86DD-55E19636CB54}.Debug.Build.0 = Debug|Win32 - {55B66AD7-F031-4B89-86DD-55E19636CB54}.Dynamic.ActiveCfg = Dynamic|Win32 - {55B66AD7-F031-4B89-86DD-55E19636CB54}.Dynamic.Build.0 = Dynamic|Win32 - {55B66AD7-F031-4B89-86DD-55E19636CB54}.Release.ActiveCfg = Release|Win32 - {55B66AD7-F031-4B89-86DD-55E19636CB54}.Release.Build.0 = Release|Win32 - {60313301-5E8F-4404-987F-CA8BAE815B1F}.Debug.ActiveCfg = Debug|Win32 - {60313301-5E8F-4404-987F-CA8BAE815B1F}.Debug.Build.0 = Debug|Win32 - {60313301-5E8F-4404-987F-CA8BAE815B1F}.Dynamic.ActiveCfg = Dynamic|Win32 - {60313301-5E8F-4404-987F-CA8BAE815B1F}.Dynamic.Build.0 = Dynamic|Win32 - {60313301-5E8F-4404-987F-CA8BAE815B1F}.Release.ActiveCfg = Release|Win32 - {60313301-5E8F-4404-987F-CA8BAE815B1F}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/DevIL/test/UnitTest/UnitTest.vcproj b/DevIL/test/UnitTest/UnitTest.vcproj deleted file mode 100644 index 072d4121..00000000 --- a/DevIL/test/UnitTest/UnitTest.vcproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DevIL/test/UnitTest/cmake/Findcppunit.cmake b/DevIL/test/UnitTest/cmake/Findcppunit.cmake new file mode 100644 index 00000000..69150167 --- /dev/null +++ b/DevIL/test/UnitTest/cmake/Findcppunit.cmake @@ -0,0 +1,75 @@ +# - try to find cppunit library +# +# Cache Variables: (probably not for direct use in your scripts) +# CPPUNIT_INCLUDE_DIR +# CPPUNIT_LIBRARY +# +# Non-cache variables you might use in your CMakeLists.txt: +# CPPUNIT_FOUND +# CPPUNIT_INCLUDE_DIRS +# CPPUNIT_LIBRARIES +# +# Requires these CMake modules: +# SelectLibraryConfigurations (included with CMake >= 2.8.0) +# FindPackageHandleStandardArgs (known included with CMake >=2.6.2) +# +# Original Author: +# 2009-2011 Ryan Pavlik +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2011. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +set(CPPUNIT_ROOT_DIR + "${CPPUNIT_ROOT_DIR}" + CACHE + PATH + "Directory to search") + +find_library(CPPUNIT_LIBRARY_RELEASE + NAMES + cppunit + HINTS + "${CPPUNIT_ROOT_DIR}") + +find_library(CPPUNIT_LIBRARY_DEBUG + NAMES + cppunitd + HINTS + "${CPPUNIT_ROOT_DIR}") + +include(SelectLibraryConfigurations) +select_library_configurations(CPPUNIT) + +# Might want to look close to the library first for the includes. +get_filename_component(_libdir "${CPPUNIT_LIBRARY_RELEASE}" PATH) + +find_path(CPPUNIT_INCLUDE_DIR + NAMES + cppunit/TestCase.h + HINTS + "${_libdir}/.." + PATHS + "${CPPUNIT_ROOT_DIR}" + PATH_SUFFIXES + include/) + + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(cppunit + DEFAULT_MSG + CPPUNIT_LIBRARY + CPPUNIT_INCLUDE_DIR) + +if(CPPUNIT_FOUND) + set(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY} ${CMAKE_DL_LIBS}) + set(CPPUNIT_INCLUDE_DIRS "${CPPUNIT_INCLUDE_DIR}") + mark_as_advanced(CPPUNIT_ROOT_DIR) +endif() + +mark_as_advanced(CPPUNIT_INCLUDE_DIR + CPPUNIT_LIBRARY_RELEASE + CPPUNIT_LIBRARY_DEBUG) -- cgit v1.2.1