Merge branch '79-integrate-google-test' into develop

Author: HerbertKoelman

.gitignore

@@ -39,6 +39,7 @@ DerivedData/
 
 # MAc OS X
 .DS_Store
+*.icloud
 
 # MAc OS X
 .DS_Store

CHANGELOG

@@ -1,4 +1,5 @@
 v1.8.0
+- integrate GTest as an external module (#79)
 - use CMake
 v1.7.3
 - sync_queue::set_max_size accepts 0.

CMakeLists.txt

@@ -14,10 +14,10 @@ set(CMAKE_CXX_STANDARD 11)
 
 configure_file(src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h)
 
-# this works becaus we've extended CMAKE_MODULE_PATH
+# this works because we've extended CMAKE_MODULE_PATH
 # uncomment if you have a conanfile.txt and run 'conan install ...' include(conan_paths)
-find_package(Git CONFIG)
-find_package(Conan)
+#find_package(Git CONFIG)
+#find_package(Conan)
 
 # main targets --------------------------------------------------
 #
@@ -38,40 +38,34 @@ endif()
 # project's public headers
 include_directories(include src)
 
-add_library(cpp-pthread-static STATIC
+set(PTHREAD_SOURCE_CODE
         src/config.h
         src/condition_variable.cpp
         src/exceptions.cpp
         src/lock_guard.cpp
         src/pthread.cpp
         src/read_write_lock.cpp
         src/thread.cpp
-        src/mutex.cpp)
+        src/mutex.cpp
+        )
+add_library(cpp-pthread-static STATIC ${PTHREAD_SOURCE_CODE})
 target_link_libraries(cpp-pthread-static pthread)
 set_target_properties(cpp-pthread-static PROPERTIES OUTPUT_NAME cpp-pthread)
 
-add_library(cpp-pthread-shared SHARED
-        src/config.h
-        src/condition_variable.cpp
-        src/exceptions.cpp
-        src/lock_guard.cpp
-        src/pthread.cpp
-        src/read_write_lock.cpp
-        src/thread.cpp
-        src/mutex.cpp)
+add_library(cpp-pthread-shared SHARED ${PTHREAD_SOURCE_CODE})
+
 target_link_libraries(cpp-pthread-shared pthread)
 set_target_properties(cpp-pthread-shared PROPERTIES OUTPUT_NAME cpp-pthread)
 
 # Testing -------------------------------------------------------
 #
 
-# Locate GTest
-if ( BUILD_TESTS )
-  find_package(GTest)
-  if (GTest_FOUND)
-    enable_testing()
-    add_subdirectory(tests)
-  endif()
+# Load and compile GTest
+# Aliases: GTest::GTest, GTest::gtest_main, GMock::GMock
+find_package(GTest PATHS cmake)
+if (GTest_FOUND)
+  enable_testing()
+  add_subdirectory(tests)
 endif()
 
 # doxygen -------------------------------------------------------
@@ -98,19 +92,14 @@ install( DIRECTORY include DESTINATION include COMPONENT Devel)
 #
 
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-# set(CPACK_GENERATOR "RPM")
-
 set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
 set(CPACK_PACKAGE_RELEASE 1)
 set(CPACK_PACKAGE_CONTACT "Herbert Koelman")
 set(CPACK_PACKAGE_VENDOR "Urbix Software")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-# set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
 
 include(CPack)
 
-cpack_add_install_type(develop DESCRIPTION "includes & libs (for developpers)")
-
 # misc ------------------------------------------------------------
 #
 find_program(RM rm)

README.md

@@ -8,27 +8,21 @@ Of course, this library is a replacement of C++11 features, it is best to use th
 
 To use this library:
 
-    configure
-    make
-    make install
-
-or
-
     mkdir build && cd build
     cmake ..
     make install
 
 Install moves files into your system's default location for headers and libraries (often /usr/local/include and /usr/local/lib). Use this command line argument to change install target directory:
 
-    configure --prefix=/usr/local
+    cmake -DCMAKE_INSTALL_PREFIX=/your/destination/
 
 Doxygen [documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command. I hope this help make things easier to use and understand.
 
     make doxygen
 
 > Doxygen can be downloaded [here](http://www.stack.nl/~dimitri/doxygen/index.html).
 
-The `make` target `pkg` will produce au tar.gz that can be distributed.
+The `make` target `package` will produce au tar.gz that can be distributed.
 
 ### How to use it
 
@@ -38,13 +32,7 @@ Once compiled and installed in a location that suites you, use your compiler opt
 
 Once your compiler is upgraded you simply include the standard `#include <thread>` and replace the namespace `pthread` for `std`. 
 
-Sample code can be found in the `tests` directory. To use it, run the following commands:
-
-  cd tests
-  ./configure
-  ./make
-
-> **WARNING** tests rely on GoogleTest and which MUST be installed before building.
+Sample code can be found in the `tests` directory.
 
 If you use CMake, the test are built and run like this (in your `build` directory):
 
@@ -96,4 +84,4 @@ This project can produce Conan Artefacts using these commands:
 
 ### Diagrams
 
-![overview](diagrams/threads-classes.png)
+![overview](diagrams/threads-classes.png)

cmake/CMakeLists.txt.in

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.11)
+
+message(STATUS "Loading external project GoogleTest")
+
+# project(googletest-download NONE)
+project(googletest-download VERSION 1.8.1)
+
+include(ExternalProject)
+ExternalProject_Add(googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG release-1.8.1
+    SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
+    BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    TEST_COMMAND ""
+)

cmake/GTestConfig.cmake

@@ -0,0 +1,46 @@
+set(__GTEST_DOWNLOAD ${CMAKE_BINARY_DIR}/googletest-download)
+file(MAKE_DIRECTORY ${__GTEST_DOWNLOAD})
+if (EXISTS ${__GTEST_DOWNLOAD})
+
+    option(INSTALL_GMOCK "Install Googletest's GMock?" OFF)
+    option(INSTALL_GTEST "Install Googletest's GTest?" OFF)
+
+    message(STATUS "Generating GoogleTest CMakeLists.txt")
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in ${__GTEST_DOWNLOAD}/CMakeLists.txt)
+
+    message(STATUS "Setup build for GoogleTest")
+    execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+            WORKING_DIRECTORY "${__GTEST_DOWNLOAD}" )
+
+    message(STATUS "Building GoogleTest")
+    execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+            WORKING_DIRECTORY "${__GTEST_DOWNLOAD}" )
+
+    # Prevent GoogleTest from overriding our compiler/linker options
+    # when building with Visual Studio
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+    # Add googletest directly to our build. This adds
+    # the following targets: gtest, gtest_main, gmock
+    # and gmock_main
+    add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
+            "${CMAKE_BINARY_DIR}/googletest-build")
+
+    # The gtest/gmock targets carry header search path
+    # dependencies automatically when using CMake 2.8.11 or
+    # later. Otherwise we have to add them here ourselves.
+    if(CMAKE_VERSION VERSION_LESS 2.8.11)
+    message(STATUS "GoogleTest include directory ${gtest_SOURCE_DIR}/include ${gmock_SOURCE_DIR}/include)")
+        include_directories("${gtest_SOURCE_DIR}/include"
+                "${gmock_SOURCE_DIR}/include")
+    endif()
+
+    add_library(GTest::GTest ALIAS gtest)
+    add_library(GTest::gtest_main ALIAS gtest_main)
+
+    add_library(GMock::GMock ALIAS gmock)
+    add_library(GMock::gmock_main ALIAS gmock_main)
+
+else()
+    message(STATUS "Failed to create GoogleTest download directory")
+endif()