Browse Source

cmake commit

Johannes R 12 years ago
parent
commit
274ebe4a37
2 changed files with 54 additions and 42 deletions
  1. 42 42
      core/testfiles.cmake
  2. 12 0
      readme.txt

+ 42 - 42
core/testfiles.cmake

@@ -1,20 +1,20 @@
 #generated by find . -name "*.cpp" -ipath "*tests*" > testfiles.cmake.t 
 #generated by find . -name "*.cpp" -ipath "*tests*" > testfiles.cmake.t 
 SET(NICE_TESTFILES_SRC 
 SET(NICE_TESTFILES_SRC 
-# ./image/tests/ImageTest.cpp
-# ./image/tests/TestImageFile.cpp
-# ./image/tests/TestRect.cpp
-# ./image/tests/TestImageFileList.cpp
-# ./image/tests/TestConvert.cpp
-# ./image/tests/TestImageOperators.cpp
-# ./image/tests/TestImageTools.cpp
-# ./image/tests/TestFilter.cpp
-# ./image/tests/TestConverter.cpp
-# ./image/tests/TestHistogram.cpp
-# ./image/tests/TestMorph.cpp
-# ./image/tests/TestDrawable.cpp
-# ./image/tests/TestColor.cpp
-# ./image/tests/MultiChannelImageTTest.cpp
-# ./image/tests/TestFourier.cpp
+./image/tests/ImageTest.cpp
+./image/tests/TestImageFile.cpp
+./image/tests/TestRect.cpp
+./image/tests/TestImageFileList.cpp
+./image/tests/TestConvert.cpp
+./image/tests/TestImageOperators.cpp
+./image/tests/TestImageTools.cpp
+./image/tests/TestFilter.cpp
+./image/tests/TestConverter.cpp
+./image/tests/TestHistogram.cpp
+./image/tests/TestMorph.cpp
+./image/tests/TestDrawable.cpp
+./image/tests/TestColor.cpp
+./image/tests/MultiChannelImageTTest.cpp
+./image/tests/TestFourier.cpp
 ./basics/tests/cppunitexTest.cpp
 ./basics/tests/cppunitexTest.cpp
 ./basics/tests/FileNameTest.cpp
 ./basics/tests/FileNameTest.cpp
 ./basics/tests/Testcasts.cpp
 ./basics/tests/Testcasts.cpp
@@ -24,12 +24,12 @@ SET(NICE_TESTFILES_SRC
 ./basics/tests/stringutilsTest.cpp
 ./basics/tests/stringutilsTest.cpp
 ./basics/tests/Testgzbinstream.cpp
 ./basics/tests/Testgzbinstream.cpp
 ./basics/tests/Testbinstream.cpp
 ./basics/tests/Testbinstream.cpp
-# ./optimization/gradientBased/tests/TestTrustRegion.cpp
-# ./optimization/blackbox/tests/TestDownhillSimplex.cpp
-# ./algebra/tests/TestLUDecomposition.cpp
-# ./algebra/tests/TestLinearSolve.cpp
-# ./algebra/tests/TestDiagApprox.cpp
-# ./algebra/tests/TestEigenValue.cpp
+./optimization/gradientBased/tests/TestTrustRegion.cpp
+./optimization/blackbox/tests/TestDownhillSimplex.cpp
+./algebra/tests/TestLUDecomposition.cpp
+./algebra/tests/TestLinearSolve.cpp
+./algebra/tests/TestDiagApprox.cpp
+./algebra/tests/TestEigenValue.cpp
 ./vector/tests/TestSparseVector.cpp
 ./vector/tests/TestSparseVector.cpp
 ./vector/tests/TestEVector.cpp
 ./vector/tests/TestEVector.cpp
 ./vector/tests/TestDistance.cpp
 ./vector/tests/TestDistance.cpp
@@ -40,21 +40,21 @@ SET(NICE_TESTFILES_SRC
 )
 )
 
 
 SET(NICE_TESTFILES_HDR
 SET(NICE_TESTFILES_HDR
-# ./image/tests/TestRect.h
-# ./image/tests/ImageTest.h
-# ./image/tests/TestMorph.h
-# ./image/tests/TestImageTools.h
-# ./image/tests/TestConvert.h
-# ./image/tests/MultiChannelImageTTest.h
-# ./image/tests/TestFourier.h
-# ./image/tests/TestImageOperators.h
-# ./image/tests/TestColor.h
-# ./image/tests/TestHistogram.h
-# ./image/tests/TestDrawable.h
-# ./image/tests/TestConverter.h
-# ./image/tests/TestFilter.h
-# ./image/tests/TestImageFileList.h
-# ./image/tests/TestImageFile.h
+./image/tests/TestRect.h
+./image/tests/ImageTest.h
+./image/tests/TestMorph.h
+./image/tests/TestImageTools.h
+./image/tests/TestConvert.h
+./image/tests/MultiChannelImageTTest.h
+./image/tests/TestFourier.h
+./image/tests/TestImageOperators.h
+./image/tests/TestColor.h
+./image/tests/TestHistogram.h
+./image/tests/TestDrawable.h
+./image/tests/TestConverter.h
+./image/tests/TestFilter.h
+./image/tests/TestImageFileList.h
+./image/tests/TestImageFile.h
 ./basics/tests/TimerTest.h
 ./basics/tests/TimerTest.h
 ./basics/tests/Testcasts.h
 ./basics/tests/Testcasts.h
 ./basics/tests/numerictoolsTest.h
 ./basics/tests/numerictoolsTest.h
@@ -64,12 +64,12 @@ SET(NICE_TESTFILES_HDR
 ./basics/tests/FileNameTest.h
 ./basics/tests/FileNameTest.h
 ./basics/tests/stringutilsTest.h
 ./basics/tests/stringutilsTest.h
 ./basics/tests/TestObserver.h
 ./basics/tests/TestObserver.h
-# ./optimization/gradientBased/tests/TestTrustRegion.h
-# ./optimization/blackbox/tests/TestDownhillSimplex.h
-# ./algebra/tests/TestDiagApprox.h
-# ./algebra/tests/TestLUDecomposition.h
-# ./algebra/tests/TestEigenValue.h
-# ./algebra/tests/TestLinearSolve.h
+./optimization/gradientBased/tests/TestTrustRegion.h
+./optimization/blackbox/tests/TestDownhillSimplex.h
+./algebra/tests/TestDiagApprox.h
+./algebra/tests/TestLUDecomposition.h
+./algebra/tests/TestEigenValue.h
+./algebra/tests/TestLinearSolve.h
 ./vector/tests/TestStreamable.h
 ./vector/tests/TestStreamable.h
 ./vector/tests/TestERowMatrix.h
 ./vector/tests/TestERowMatrix.h
 ./vector/tests/TestEMatrix.h
 ./vector/tests/TestEMatrix.h

+ 12 - 0
readme.txt

@@ -113,6 +113,18 @@ NICE_USELIB_LIBMAGICK
 
 
 #eigene definiton zum builden der sub-test-ordners
 #eigene definiton zum builden der sub-test-ordners
 NICE_BUILD_TESTS	 http://www.comp.nus.edu.sg/~cs3215/tools/cppunitAll.html
 NICE_BUILD_TESTS	 http://www.comp.nus.edu.sg/~cs3215/tools/cppunitAll.html
+running tests: <build ordner>: cmake
+running tests mit schönen übersicht: <build ordner>: cmake --output-on-failure
+
+
 NICE_BUILD_PROGS
 NICE_BUILD_PROGS
 
 
 /wd"4244" /wd"4100" /wd"4127" /wd"4091" 
 /wd"4244" /wd"4100" /wd"4127" /wd"4091" 
+
+#adding custom build step:
+	if(BUILD_CORE_TESTS_PERFORM_AS_POSTBUILD_STEP)
+		add_custom_command(TARGET ${__testname}
+                   POST_BUILD
+                   COMMAND "$<TARGET_FILE:${__testname}>"
+                   COMMENT "Unit Tests...")
+	else()