Skip to content

GitLab

Commit ec50832e authored by Jan Möbius's avatar Jan Möbius
Browse files
Options

Merge branch 'master' into python_strip_string_fix

parents 25178d9d b2db4f4d
Pipeline #4229 canceled with stage
    in 7 minutes and 39 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 0 deletions
    cmake/FindGoogleTest.cmake
    View file @ ec50832e
    ......@@ -42,6 +42,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
    else(GTEST_PREFIX)
    find_path(_GTEST_INCLUDE_DIR "gtest/gtest.h"
    PATHS
    ~/sw/gtest-1.8.0/include
    ~/sw/gtest-1.7.0/include
    ~/sw/gtest/include
    /ACG/acgdev/gcc-4.7-x86_64/gtest/include
    ......@@ -52,6 +53,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
    NO_DEFAULT_PATH )
    find_library(_GTEST_LIBRARY gtest
    PATHS
    ~/sw/gtest-1.8.0/lib
    ~/sw/gtest-1.7.0/lib
    ~/sw/gtest/lib
    /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
    ......@@ -62,6 +64,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
    NO_DEFAULT_PATH )
    find_library(_GTEST_MAIN_LIBRARY gtest_main
    PATHS
    ~/sw/gtest-1.8.0/lib
    ~/sw/gtest-1.7.0/lib
    ~/sw/gtest/lib
    /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment