build: minor changes and updates to readme and cmake

* corrected version of referenced dependencies
* changed cmake to generate test_main.cpp file on windows rather than copy it

CMakeLists.txt

@@ -700,6 +700,8 @@ else ()
 	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp "")
+
 add_subdirectory(src/test)
 
 set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})

README.md

@@ -7,17 +7,15 @@
 * JDK 1.8
 * QT 5.9.1
 * CxxTest 4.3
-* Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 5.0 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.64
 * Botan 2.1.0
 * Image Magick 7.0.6
 * ccache (Unix)
+* Visual Leak Detector (Windows)
 * Wix 3.11 (Windows)
 * Winrar (Windows)
 
-also something about java, but who knows...
-
-
 #### Environment Variables
 
 * CXX_TEST_DIR - .../cxxtest-4.3
@@ -29,8 +27,8 @@ For MacOS and Linux
 * QT_DIR - .../Qt/Qt5.9.1/5.9.1/<IDE>
 
 For Windows:
-* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015<IDE>
+* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015
-* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64<IDE>
+* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64
 * VLD_DIR - .../Visual Leak Detector
 * JAVA_HOME - .../Java/jdk1.x.x_xxx
 * path

script/setup.sh

@@ -103,10 +103,6 @@ fi
 
 
 if [ $PLATFORM == "Windows" ]; then
-	echo -e $INFO "copy test_main file"
-	cp -u setup/cxx_test/windows/test_main.cpp build/win32
-	cp -u setup/cxx_test/windows/test_main.cpp build/win64
-
 	echo -e $INFO "creating program icon"
 	sh script/create_windows_icon.sh
 fi

setup/cxx_test/windows/test_main.cpp

@@ -1,36 +0,0 @@
-/* Generated file, do not edit */
-
-#ifndef CXXTEST_RUNNING
-#define CXXTEST_RUNNING
-#endif
-
-#include <cxxtest/TestListener.h>
-#include <cxxtest/TestTracker.h>
-#include <cxxtest/TestRunner.h>
-#include <cxxtest/RealDescriptions.h>
-#include <cxxtest/TestMain.h>
-#include <cxxtest/ParenPrinter.h>
-
-int main( int argc, char *argv[] ) {
- int status;
-    CxxTest::ParenPrinter tmp;
-    CxxTest::RealWorldDescription::_worldName = "cxxtest";
-    status = CxxTest::Main< CxxTest::ParenPrinter >( tmp, argc, argv );
-    return status;
-}
-bool suite_UtilityTestSuite_init = false;
-#include "D:\projekte\code\2014_master_project\masterproject\src\test\UtilityTestSuite.h"
-
-static UtilityTestSuite suite_UtilityTestSuite;
-
-static CxxTest::List Tests_UtilityTestSuite = { 0, 0 };
-CxxTest::StaticSuiteDescription suiteDescription_UtilityTestSuite( "D:/projekte/code/2014_master_project/masterproject/src/test/UtilityTestSuite.h", 5, "UtilityTestSuite", suite_UtilityTestSuite, Tests_UtilityTestSuite );
-
-static class TestDescription_suite_UtilityTestSuite_test_one_returns_the_number_one : public CxxTest::RealTestDescription {
-public:
- TestDescription_suite_UtilityTestSuite_test_one_returns_the_number_one() : CxxTest::RealTestDescription( Tests_UtilityTestSuite, suiteDescription_UtilityTestSuite, 8, "test_one_returns_the_number_one" ) {}
- void runTest() { suite_UtilityTestSuite.test_one_returns_the_number_one(); }
-} testDescription_suite_UtilityTestSuite_test_one_returns_the_number_one;
-
-#include <cxxtest/Root.cpp>
-const char* CxxTest::RealWorldDescription::_worldName = "cxxtest";