Merge pull request #249 from canmor/main

Add support for latest GoogleTest and Boost

Author: jermus67

CMakeLists.txt

@@ -26,7 +26,17 @@ set(CUKE_ENABLE_SANITIZER       "OFF" CACHE STRING "Sanitizer to use for checkin
 set_property(CACHE CUKE_ENABLE_SANITIZER PROPERTY STRINGS OFF "address" "thread" "undefined")
 option(CUKE_TESTS_VALGRIND      "Enable tests within Valgrind" OFF)
 set(GMOCK_SRC_DIR "" CACHE STRING "Google Mock framework sources path (otherwise downloaded)")
-set(GMOCK_VER "1.7.0" CACHE STRING "Google Mock framework version to be used")
+set(GMOCK_VER "1.11.0" CACHE STRING "Google Mock framework version to be used")
+
+# according to: https://github.com./google/googletest/tree/release-1.10.0#18x-release
+# the 1.8.x is the last release that works with pre-C++11 compilers.
+if(GMOCK_VER VERSION_GREATER_EQUAL "1.9.0")
+    if(NOT DEFINED CMAKE_CXX_STANDARD)
+        set(CMAKE_CXX_STANDARD 11)
+    elseif(CMAKE_CXX_STANDARD LESS 11)
+        message(FATAL_ERROR "C++11 (above) is required by googletest version: ${GMOCK_VER}")
+    endif()
+endif()
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
 
@@ -126,6 +136,16 @@ else()
     find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${CUKE_CORE_BOOST_LIBS} REQUIRED)
 endif()
 
+# according to: https://www.boost.org/users/history/version_1_76_0.html
+# C++11 (above) is required by boost::regex since v1.76.0
+if(Boost_VERSION VERSION_GREATER_EQUAL "1.76.0")
+    if(NOT DEFINED CMAKE_CXX_STANDARD)
+        set(CMAKE_CXX_STANDARD 11)
+    elseif(CMAKE_CXX_STANDARD LESS 11)
+        message(FATAL_ERROR "C++11 (above) is required by boost::regex version: ${Boost_VERSION}")
+    endif()
+endif()
+
 # Create import targets for CMake versions older than 3.5 (actually older FindBoost.cmake)
 if(Boost_USE_STATIC_LIBS)
     set(LIBRARY_TYPE STATIC)

cmake/modules/FindGMock.cmake

@@ -342,10 +342,17 @@ if(NOT (${GMOCK_LIBRARY_EXISTS} AND ${GTEST_LIBRARY_EXISTS}))
             mark_as_advanced(GMOCK_INCLUDE_DIR)
         else() #1.8.0
             set(GMOCK_BIN_DIR "${GMOCK_ROOT}/src/gmock-build")
-            set(GTEST_LIBRARY "${GMOCK_BIN_DIR}/googlemock/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GTEST_MAIN_LIBRARY "${GMOCK_BIN_DIR}/googlemock/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GMOCK_LIBRARY "${GMOCK_BIN_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
-            set(GMOCK_MAIN_LIBRARY "${GMOCK_BIN_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+            if("${GMOCK_VER}" STREQUAL "1.8.0" OR "${GMOCK_VER}" STREQUAL "1.8.1")
+                set(GTEST_LIBRARY "${GMOCK_BIN_DIR}/googlemock/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
+                set(GTEST_MAIN_LIBRARY "${GMOCK_BIN_DIR}/googlemock/gtest/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+                set(GMOCK_LIBRARY "${GMOCK_BIN_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
+                set(GMOCK_MAIN_LIBRARY "${GMOCK_BIN_DIR}/googlemock/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+            else() # newer version get gmock and gtest generate into same lib folder
+                set(GTEST_LIBRARY "${GMOCK_BIN_DIR}/lib/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
+                set(GTEST_MAIN_LIBRARY "${GMOCK_BIN_DIR}/lib/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+                set(GMOCK_LIBRARY "${GMOCK_BIN_DIR}/lib/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
+                set(GMOCK_MAIN_LIBRARY "${GMOCK_BIN_DIR}/lib/${CMAKE_CFG_INTDIR}/${GTEST_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+            endif()
             mark_as_advanced(GTEST_LIBRARY)
             mark_as_advanced(GTEST_MAIN_LIBRARY)
             mark_as_advanced(GMOCK_LIBRARY)

include/cucumber-cpp/internal/drivers/DriverSelector.hpp

@@ -1,4 +1,4 @@
-#if defined(GTEST_INCLUDE_GTEST_GTEST_H_)
+#if defined(GTEST_INCLUDE_GTEST_GTEST_H_) || defined(GOOGLETEST_INCLUDE_GTEST_GTEST_H_)
     #include "GTestDriver.hpp"
 #elif defined(BOOST_TEST_CASE)
     #include "BoostDriver.hpp"