From abd93d824a4d274bf8fada798de76f08f101cdca Mon Sep 17 00:00:00 2001 From: vitaut Date: Wed, 10 Feb 2016 07:16:49 -0800 Subject: [PATCH] Move gmock into test/ --- test/CMakeLists.txt | 6 ++---- {gmock => test}/gmock-gtest-all.cc | 0 {gmock => test}/gmock/gmock.h | 0 {gmock => test}/gtest/gtest-spi.h | 0 {gmock => test}/gtest/gtest.h | 0 5 files changed, 2 insertions(+), 4 deletions(-) rename {gmock => test}/gmock-gtest-all.cc (100%) rename {gmock => test}/gmock/gmock.h (100%) rename {gmock => test}/gtest/gtest-spi.h (100%) rename {gmock => test}/gtest/gtest.h (100%) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 89bce0c0..7c8cd3f5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -5,12 +5,10 @@ # See the Google Test FAQ "Why is it not recommended to install a # pre-compiled copy of Google Test (for example, into /usr/local)?" # at http://code.google.com/p/googletest/wiki/FAQ for more details. -set(FMT_GMOCK_DIR ../gmock) add_library(gmock STATIC - ${FMT_GMOCK_DIR}/gmock-gtest-all.cc ${FMT_GMOCK_DIR}/gmock/gmock.h - ${FMT_GMOCK_DIR}/gtest/gtest.h ${FMT_GMOCK_DIR}/gtest/gtest-spi.h) -target_include_directories(gmock PUBLIC ${FMT_GMOCK_DIR}) + gmock-gtest-all.cc gmock/gmock.h gtest/gtest.h gtest/gtest-spi.h) target_compile_options(gmock PUBLIC ${CPP11_FLAG}) +target_include_directories(gmock PUBLIC .) find_package(Threads) if (Threads_FOUND) diff --git a/gmock/gmock-gtest-all.cc b/test/gmock-gtest-all.cc similarity index 100% rename from gmock/gmock-gtest-all.cc rename to test/gmock-gtest-all.cc diff --git a/gmock/gmock/gmock.h b/test/gmock/gmock.h similarity index 100% rename from gmock/gmock/gmock.h rename to test/gmock/gmock.h diff --git a/gmock/gtest/gtest-spi.h b/test/gtest/gtest-spi.h similarity index 100% rename from gmock/gtest/gtest-spi.h rename to test/gtest/gtest-spi.h diff --git a/gmock/gtest/gtest.h b/test/gtest/gtest.h similarity index 100% rename from gmock/gtest/gtest.h rename to test/gtest/gtest.h