Skip to content

Commit

Permalink
removed workaround for cmake versions prior to 2.8.10
Browse files Browse the repository at this point in the history
  • Loading branch information
niosHD committed Jan 13, 2016
1 parent 891e911 commit ef7bbff
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ function (target_link_cppformat target)
endif ()
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.
# See the Google Test FAQ "Why is it not recommended to install a
# pre-compiled copy of Google Test (for example, into /usr/local)?"
Expand All @@ -24,7 +18,7 @@ endfunction ()
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)
fmt_target_include_directories(gmock INTERFACE ${FMT_GMOCK_DIR})
target_include_directories(gmock INTERFACE ${FMT_GMOCK_DIR})
find_package(Threads)
if (Threads_FOUND)
target_link_libraries(gmock ${CMAKE_THREAD_LIBS_INIT})
Expand All @@ -43,7 +37,7 @@ check_cxx_source_compiles("
check_cxx_source_compiles("
#include <initializer_list>
int main() {}" FMT_INITIALIZER_LIST)

if (NOT FMT_VARIADIC_TEMPLATES OR NOT FMT_INITIALIZER_LIST)
add_definitions(-DGTEST_LANG_CXX11=0)
endif ()
Expand Down

0 comments on commit ef7bbff

Please sign in to comment.