v1.2 patch

Signed-off-by: Rian Quinn <“[email protected]”>
Bareflank · Mar 20, 2017 · 6108071 · 6108071
1 parent 6a009fa
commit 6108071
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -243,30 +243,32 @@ SOURCE_GROUP("Tests" FILES ${TEST_SOURCES})
 SOURCE_GROUP("Surrogates" FILES ${IMPL_SOURCES})
 SOURCE_GROUP("Benchmarks" FILES ${BENCH_SOURCES})
 
-# configure the executable
-include_directories(${HEADER_DIR})
-add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${HEADERS})
-add_executable(Benchmark ${BENCH_SOURCES} ${HEADERS})
+# ------------------------------------------------------------------------------
+# bareflank: start
+# ------------------------------------------------------------------------------
+# include_directories(${HEADER_DIR})
+# add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${HEADERS})
+# add_executable(Benchmark ${BENCH_SOURCES} ${HEADERS})
+#
+# if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
+#     target_compile_options( SelfTest PRIVATE -Wall -Wextra )
+#     target_compile_options( Benchmark PRIVATE -Wall -Wextra )
+# endif()
+# if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
+#     target_compile_options( SelfTest PRIVATE /W4 /w44265 /WX )
+#     target_compile_options( Benchmark PRIVATE /W4 )
+# endif()
+#
+# enable_testing()
+# add_test(NAME RunTests COMMAND SelfTest)
 
-# Add desired warnings
-if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
-    target_compile_options( SelfTest PRIVATE -Wall -Wextra )
-    target_compile_options( Benchmark PRIVATE -Wall -Wextra )
-endif()
-if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
-    target_compile_options( SelfTest PRIVATE /W4 /w44265 /WX )
-    target_compile_options( Benchmark PRIVATE /W4 )
-endif()
-
-
-# configure unit tests via CTest
-enable_testing()
-add_test(NAME RunTests COMMAND SelfTest)
-
-add_test(NAME ListTests COMMAND SelfTest --list-tests)
-set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases")
+# add_test(NAME ListTests COMMAND SelfTest --list-tests)
+# set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases")
 
-add_test(NAME ListTags COMMAND SelfTest --list-tags)
-set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags")
+# add_test(NAME ListTags COMMAND SelfTest --list-tags)
+# set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags")
+# ------------------------------------------------------------------------------
+# bareflank: start
+# ------------------------------------------------------------------------------
 
 install(DIRECTORY "single_include/" DESTINATION "include/catch/")
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
@@ -2376,11 +2376,14 @@ namespace Catch {
 // #included from: catch_timer.h
 #define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
 
-#ifdef CATCH_PLATFORM_WINDOWS
-typedef unsigned long long uint64_t;
-#else
+// -----------------------------------------------------------------------------
+// bareflank: start
+// -----------------------------------------------------------------------------
+// compilation issue with cygwin
 #include <stdint.h>
-#endif
+// -----------------------------------------------------------------------------
+// bareflank: end
+// -----------------------------------------------------------------------------
 
 namespace Catch {
 
@@ -11336,4 +11339,3 @@ int main (int argc, char * const argv[]) {
 using Catch::Detail::Approx;
 
 #endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-