Skip to content

Commit

Permalink
Used bundled gtest
Browse files Browse the repository at this point in the history
  • Loading branch information
shinaoka committed Oct 30, 2018
1 parent fba2536 commit 2dfc172
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ matrix:
sudo: enabled
before_install:
- sudo apt-get update
- sudo apt-get install -y gcc liblapack-dev cmake libfftw3-dev libgtest-dev python-dev
- sudo apt-get install -y gcc liblapack-dev cmake libfftw3-dev python-dev
#- sudo apt-get install -y gcc liblapack-dev cmake libfftw3-dev libgtest-dev python-dev
- pip install numpy --user
- pip install scipy --user
- sudo apt-get install -y libopenmpi-dev openmpi-bin
Expand Down
12 changes: 6 additions & 6 deletions test/c++/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 2.8.12)

function(add_gtest test)
set(source "${ARGV1}/${test}.cpp")
#set(gtest_src "${ARGV1}/gtest_main.cc;${ARGV1}/gtest-all.cc")
set(gtest_src "${ARGV1}/gtest_main.cc;${ARGV1}/gtest-all.cc")

add_executable(${test} ${source} ${header_files})
target_link_libraries(${test} GTest::GTest GTest::Main pthread)
add_executable(${test} ${source} ${gtest_src} ${header_files})
target_link_libraries(${test} pthread gf)
target_include_directories(${test} PRIVATE ${HDF5_INCLUDE_DIR})
add_test(NAME ${test} COMMAND ${test} ${test_xml_output})
endfunction(add_gtest)

find_package(GTest REQUIRED)
include_directories(BEFORE ${GTEST_INCLUDE_DIRS})
#find_package(GTest REQUIRED)
#include_directories(BEFORE ${GTEST_INCLUDE_DIRS})
include_directories(../../c++/include)

# test for SPM library
Expand All @@ -25,7 +25,7 @@ test_pade

foreach(test_c++ ${unittest_src_gf})
add_gtest(${test_c++} ".")
target_link_libraries(${test_c++} gf)
#target_link_libraries(${test_c++} gf)
endforeach(test_c++)

add_subdirectory(data)

0 comments on commit 2dfc172

Please sign in to comment.