From 9bb0aed80509b2020938fb7f15b6daf2765f33ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Wed, 27 May 2015 07:45:13 +0200 Subject: [PATCH] Update googletest to latest, and deactivate certain class of warnings for its compilation --- CMakeLists.txt | 6 ++++-- README.md | 4 ++++ googletest | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97ea398..5b50c9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ else (MSVC) set(CPPCHECK_ARG_TEMPLATE "--template=gcc") if (CMAKE_COMPILER_IS_GNUCXX) # GCC flags + #add_compile_options() is not supported with CMake 2.8.7 of Ubuntu 12.04 on Travis-CI add_definitions(-rdynamic -fstack-protector-all -Wall -Wextra -pedantic -Wformat-security -Winit-self -Wswitch-default -Wswitch-enum -Wfloat-equal -Wshadow -Wcast-qual -Wconversion -Wlogical-op -Winline) elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # Clang flags @@ -211,11 +212,12 @@ endif (SQLITECPP_BUILD_EXAMPLES) option(SQLITECPP_BUILD_TESTS "Build and run tests." OFF) if (SQLITECPP_BUILD_TESTS) - # add the subdirectory containing the CMakeLists.txt for the gtest library + # deactivate some warnings for compiling the gtest library if (NOT MSVC) - add_definitions(-Wno-variadic-macros -Wno-long-long -Wno-conversion -Wno-switch-enum) + add_definitions(-Wno-variadic-macros -Wno-long-long -Wno-switch-enum -Wno-float-equal -Wno-conversion-null -Wno-switch-default -Wno-pedantic) endif (NOT MSVC) + # add the subdirectory containing the CMakeLists.txt for the gtest library add_subdirectory(googletest) include_directories("${PROJECT_SOURCE_DIR}/googletest/include") diff --git a/README.md b/README.md index b1bd492..a7ba919 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,10 @@ ln -s ../examples examples ctest . # make test ``` +#### CMake options + + * For more options on customizing the build, see the [CMakeLists.txt](https://github.com/SRombauts/SQLiteCpp/blob/master/CMakeLists.txt) file. + #### Troubleshooting Under Linux, if you get muliple linker errors like "undefined reference to sqlite3_xxx", diff --git a/googletest b/googletest index 4650552..23574bf 160000 --- a/googletest +++ b/googletest @@ -1 +1 @@ -Subproject commit 4650552ff637bb44ecf7784060091cbed3252211 +Subproject commit 23574bf2333f834ff665f894c97bef8a5b33a0a9