Fix #191 CMake Warning line 299

This commit is contained in:
Sébastien Rombauts 2019-03-03 21:20:36 +01:00
parent 469148a1e2
commit cb6c16aadb
2 changed files with 4 additions and 4 deletions

View File

@ -296,7 +296,7 @@ if (SQLITECPP_BUILD_TESTS)
# Add definitions to keep googletest from making the compilation fail # Add definitions to keep googletest from making the compilation fail
if (MSVC) if (MSVC)
if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919) # OR MSVC_TOOLSET_VERSION EQUAL 141) if (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919) # OR MSVC_TOOLSET_VERSION EQUAL 141)
target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)

View File

@ -17,9 +17,9 @@ if ERRORLEVEL 1 goto onError
ctest --output-on-failure ctest --output-on-failure
if ERRORLEVEL 1 goto onError if ERRORLEVEL 1 goto onError
cd .. goto onSuccess
exit
:onError :onError
@echo An error occured! @echo An error occured!
cd .. :onSuccess
cd ..