Add InstallGTest and improve FindRapidJSON.

Author: viferga

FindRapidJSON.cmake

@@ -1,4 +1,3 @@
-
 #
 #	CMake Find RapidJSON by Parra Studios
 #	CMake script to find RapidJSON library.
@@ -23,18 +22,29 @@
 # RAPIDJSON_CXX_FLAGS - Custom RapidJSON compilation flags.
 # RAPIDJSON_INCLUDE_DIRS - A list of directories where the RapidJSON headers are located.
 
-foreach(opt RAPIDJSON_INCLUDEDIR RAPIDJSON_USE_SSE2 RAPIDJSON_USE_SSE42)
+# Prevent vervosity if already included
+if(RAPIDJSON_FOUND)
+	set(RAPIDJSON_FIND_QUIETLY TRUE)
+endif()
+
+foreach(opt RAPIDJSON_INCLUDE_DIR RAPIDJSON_USE_SSE2 RAPIDJSON_USE_SSE42)
 	if(${opt} AND DEFINED ENV{${opt}} AND NOT ${opt} STREQUAL "$ENV{${opt}}")
 		message(WARNING "Conflicting ${opt} values: ignoring environment variable and using CMake cache entry")
 	elseif(DEFINED ENV{${opt}} AND NOT ${opt})
 		set(${opt} "$ENV{${opt}}")
 	endif()
 endforeach()
 
+# Default RapidJSON include paths
+set(RAPIDJSON_INCLUDE_DIR
+	"${RAPIDJSON_INCLUDE_DIR}"
+	"/usr/local/include/"
+)
+
 find_path(
 	RAPIDJSON_INCLUDE_DIRS
 	NAMES rapidjson/rapidjson.h
-	PATHS ${RAPIDJSON_INCLUDEDIR}
+	PATHS ${RAPIDJSON_INCLUDE_DIR}
 	DOC "Include directory for the RapidJSON library"
 )
 
@@ -67,12 +77,12 @@ endif()
 mark_as_advanced(RAPIDJSON_CXX_FLAGS)
 
 if(RAPIDJSON_FOUND)
-	if(NOT RapidJSON_FIND_QUIETLY)
+	if(NOT RAPIDJSON_FIND_QUIETLY)
 		message(STATUS "Found RapidJSON header files in ${RAPIDJSON_INCLUDE_DIRS}")
 		if(DEFINED RAPIDJSON_CXX_FLAGS)
 			message(STATUS "Found RapidJSON C++ extra compilation flags: ${RAPIDJSON_CXX_FLAGS}")
 		endif()
 	endif()
-elseif(RapidJSON_FIND_REQUIRED)
+elseif(RAPIDJSON_FIND_REQUIRED)
 	message(FATAL_ERROR "Could not find RapidJSON")
 endif()

InstallGTest.cmake

@@ -0,0 +1,87 @@
+#
+#	CMake Install Google Test by Parra Studios
+#	CMake script to install Google Test library.
+#
+#	Copyright (C) 2016 - 2019 Vicente Eduardo Ferrer Garcia <[email protected]>
+#
+#	Licensed under the Apache License, Version 2.0 (the "License");
+#	you may not use this file except in compliance with the License.
+#	You may obtain a copy of the License at
+#
+#		http://www.apache.org/licenses/LICENSE-2.0
+#
+#	Unless required by applicable law or agreed to in writing, software
+#	distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+#
+
+# The following variables are set:
+#
+# GTEST_INCLUDE_DIRS - A list of directories where the Google Test headers are located.
+# GTEST_LIBRARIES - A list of directories where the Google Test libraries are located.
+
+if(NOT GTEST_FOUND OR USE_BUNDLED_GTEST)
+	if(NOT GTEST_VERSION OR USE_BUNDLED_GTEST)
+		set(GTEST_VERSION 1.8.1)
+	endif()
+
+	find_package(Threads REQUIRED)
+
+	if(MINGW)
+		set(GTEST_DISABLE_PTHREADS ON)
+	else()
+		set(GTEST_DISABLE_PTHREADS OFF)
+	endif()
+
+	# Import Google Test Framework
+	ExternalProject_Add(GoogleTest
+		GIT_REPOSITORY https://github.com/google/googletest.git
+		GIT_TAG release-${GTEST_VERSION}
+		CMAKE_ARGS -Dgmock_build_tests=OFF
+			-Dgtest_build_samples=OFF
+			-Dgtest_build_tests=OFF
+			-Dgtest_disable_pthreads=${GTEST_DISABLE_PTHREADS}
+			-Dgtest_force_shared_crt=ON
+			-Dgtest_hide_internal_symbols=OFF
+			-DINSTALL_GTEST=OFF
+			-DBUILD_GMOCK=ON
+		PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
+		UPDATE_COMMAND ""
+		INSTALL_COMMAND ""
+		TEST_COMMAND ""
+	)
+
+	# Google Test include and binary directories
+	ExternalProject_Get_Property(GoogleTest source_dir binary_dir)
+
+	set(GTEST_INCLUDE_DIR "${source_dir}/googletest/include")
+	set(GMOCK_INCLUDE_DIR "${source_dir}/googlemock/include")
+	set(GTEST_LIBS_DIR "${binary_dir}/googlemock/gtest")
+	set(GMOCK_LIBS_DIR "${binary_dir}/googlemock")
+
+	if(MSVC)
+		set(GTEST_LIB_SUFFIX "lib")
+	else()
+		set(GTEST_LIB_SUFFIX "a")
+	endif()
+
+	# Define Paths
+	set(GTEST_INCLUDE_DIRS
+		"${GTEST_INCLUDE_DIR}"
+		"${GMOCK_INCLUDE_DIR}"
+	)
+
+	set(GTEST_LIBRARIES
+		"${GTEST_LIBS_DIR}/libgtest.${GTEST_LIB_SUFFIX}"
+		"${GMOCK_LIBS_DIR}/libgmock.${GTEST_LIB_SUFFIX}"
+		"${CMAKE_THREAD_LIBS_INIT}"
+	)
+
+	set(GTEST_FOUND TRUE)
+
+	mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES)
+
+	message(STATUS "Install Google Test v${GTEST_VERSION}")
+endif ()