stuff that broke e2e test

Author: konserw

CMakeLists.txt

@@ -81,7 +81,7 @@ endif()
 
 if(NOT CUKE_DISABLE_GTEST)
     set(GTEST_USE_STATIC_LIBS ${CUKE_USE_STATIC_GTEST})
-    set(GMOCK_ROOT "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+    set(GMOCK_ROOT ${CMAKE_CURRENT_BINARY_DIR})
     find_package(GMock REQUIRED)
 
     if(GTEST_FOUND)

cmake/modules/FindGMock.cmake

@@ -159,30 +159,30 @@ if("${GMOCK_SRC_DIR}" STREQUAL "")
         gtest
         GIT_REPOSITORY "https://github.com/google/googletest.git"
         GIT_TAG "release-${GMOCK_VER}"
-        PREFIX "${GMOCK_ROOT}"
+        PREFIX ${GMOCK_ROOT}
         INSTALL_COMMAND ""
         LOG_DOWNLOAD ON
         LOG_CONFIGURE ON
         LOG_BUILD ON
-        CMAKE_ARGS "${GTEST_CMAKE_ARGS}"
+        CMAKE_ARGS ${GTEST_CMAKE_ARGS}
     )
     ExternalProject_Add(
         gmock
         GIT_REPOSITORY "https://github.com/google/googlemock.git"
         GIT_TAG "release-${GMOCK_VER}"
-        PREFIX "${GMOCK_ROOT}"
+        PREFIX ${GMOCK_ROOT}
         INSTALL_COMMAND ""
         LOG_DOWNLOAD ON
         LOG_CONFIGURE ON
         LOG_BUILD ON
-        CMAKE_ARGS "${GTEST_CMAKE_ARGS}"
+        CMAKE_ARGS ${GTEST_CMAKE_ARGS}
     )
 
     add_library(libgtest IMPORTED STATIC GLOBAL)
     add_dependencies(libgtest gtest)
     add_library(libgmock IMPORTED STATIC GLOBAL)
-    add_dependencies(libgmock gtest)
     add_dependencies(libgmock gmock)
+    add_dependencies(gmock gtest)
 
     ExternalProject_Get_Property(gtest source_dir binary_dir)
     set(GTEST_INCLUDE_DIR  "${source_dir}/include")
@@ -192,7 +192,7 @@ if("${GMOCK_SRC_DIR}" STREQUAL "")
     set(GTEST_MAIN_LIBRARY "${binary_dir}/${CMAKE_CFG_INTDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${Suffix}")
     mark_as_advanced(GTEST_MAIN_LIBRARY)
     ExternalProject_Get_Property(gmock source_dir binary_dir)
-    set(GMOCK_INCLUDE_DIR  "${gmock_source_dir}/include")
+    set(GMOCK_INCLUDE_DIR  "${source_dir}/include")
     mark_as_advanced(GMOCK_INCLUDE_DIR)
     set(GMOCK_LIBRARY      "${binary_dir}/${CMAKE_CFG_INTDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${Suffix}")
     mark_as_advanced(GMOCK_LIBRARY)
@@ -224,7 +224,7 @@ else()
     mark_as_advanced(GTEST_LIBRARY)
     set(GTEST_MAIN_LIBRARY "${binary_dir}/gtest/${CMAKE_CFG_INTDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${Suffix}")
     mark_as_advanced(GTEST_MAIN_LIBRARY)
-    set(GMOCK_INCLUDE_DIR  "${gmock_source_dir}/include")
+    set(GMOCK_INCLUDE_DIR  "${source_dir}/include")
     mark_as_advanced(GMOCK_INCLUDE_DIR)
     set(GMOCK_LIBRARY      "${binary_dir}/${CMAKE_CFG_INTDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gmock${Suffix}")
     mark_as_advanced(GMOCK_LIBRARY)
@@ -244,19 +244,9 @@ set_target_properties(libgmock PROPERTIES
     "INTERFACE_INCLUDE_DIRECTORIES" "${GMOCK_INCLUDE_DIR}"
 )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMock DEFAULT_MSG GMOCK_LIBRARY GMOCK_INCLUDE_DIR GMOCK_MAIN_LIBRARY)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMock DEFAULT_MSG GMOCK_LIBRARY GMOCK_INCLUDE_DIR GMOCK_MAIN_LIBRARY)
 
-if(GMOCK_FOUND)
-    set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})
-    set(GMOCK_LIBRARIES ${GMOCK_LIBRARY})
-    set(GMOCK_MAIN_LIBRARIES ${GMOCK_MAIN_LIBRARY})
-    set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
-    if(VERBOSE)
-      Message(STATUS "GMock includes: ${GMOCK_INCLUDE_DIRS}")
-      Message(STATUS "GMock libs: ${GMOCK_BOTH_LIBRARIES}")
-    endif()
-endif()
 if(GTEST_FOUND)
     set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
     set(GTEST_LIBRARIES ${GTEST_LIBRARY})
@@ -268,3 +258,13 @@ if(GTEST_FOUND)
     endif()
 endif()
 
+if(GMOCK_FOUND)
+    set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIR})
+    set(GMOCK_LIBRARIES ${GMOCK_LIBRARY})
+    set(GMOCK_MAIN_LIBRARIES ${GMOCK_MAIN_LIBRARY})
+    set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
+    if(VERBOSE)
+      Message(STATUS "GMock includes: ${GMOCK_INCLUDE_DIRS}")
+      Message(STATUS "GMock libs: ${GMOCK_BOTH_LIBRARIES}")
+    endif()
+endif()

src/CMakeLists.txt

@@ -15,7 +15,7 @@ set(CUKE_SOURCES
     connectors/wire/WireProtocolCommands.cpp
 )
 
-if(GMOCK_FOUND)
+if(GTEST_FOUND)
     include_directories(${GTEST_INCLUDE_DIRS})
     list(APPEND CUKE_SOURCES drivers/GTestDriver.cpp)
 endif()