feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

removed workaround for cmake versions prior to 2.8.10

Browse Source
This commit is contained in:
Mario Werner
2016-01-13 09:54:02 +01:00
parent 891e9117f6
commit ef7bbfff87
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/CMakeLists.txt
View File

@@ -10,12 +10,6 @@ function (target_link_cppformat target)
endif () endif ()
endfunction () endfunction ()
function (fmt_target_include_directories)
if (CMAKE_MAJOR_VERSION VERSION_GREATER 2.8.10)
target_include_directories(${ARGN})
endif ()
endfunction ()
# We compile Google Test ourselves instead of using pre-compiled libraries. # We compile Google Test ourselves instead of using pre-compiled libraries.
# See the Google Test FAQ "Why is it not recommended to install a # See the Google Test FAQ "Why is it not recommended to install a
# pre-compiled copy of Google Test (for example, into /usr/local)?" # pre-compiled copy of Google Test (for example, into /usr/local)?"
@@ -24,7 +18,7 @@ endfunction ()
add_library(gmock STATIC add_library(gmock STATIC
${FMT_GMOCK_DIR}/gmock-gtest-all.cc ${FMT_GMOCK_DIR}/gmock/gmock.h ${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) ${FMT_GMOCK_DIR}/gtest/gtest.h ${FMT_GMOCK_DIR}/gtest/gtest-spi.h)
fmt_target_include_directories(gmock INTERFACE ${FMT_GMOCK_DIR}) target_include_directories(gmock INTERFACE ${FMT_GMOCK_DIR})
find_package(Threads) find_package(Threads)
if (Threads_FOUND) if (Threads_FOUND)
target_link_libraries(gmock ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(gmock ${CMAKE_THREAD_LIBS_INIT})
@@ -43,7 +37,7 @@ check_cxx_source_compiles("
check_cxx_source_compiles(" check_cxx_source_compiles("
#include <initializer_list> #include <initializer_list>
int main() {}" FMT_INITIALIZER_LIST) int main() {}" FMT_INITIALIZER_LIST)
if (NOT FMT_VARIADIC_TEMPLATES OR NOT FMT_INITIALIZER_LIST) if (NOT FMT_VARIADIC_TEMPLATES OR NOT FMT_INITIALIZER_LIST)
add_definitions(-DGTEST_LANG_CXX11=0) add_definitions(-DGTEST_LANG_CXX11=0)
endif () endif ()