From 6299e02cf0b16e9023350134f223ab9791d50077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 29 Sep 2011 14:00:53 +0000 Subject: [PATCH] Added library dir to unittests git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@410 fdac6126-5c0c-442c-9429-916003d36597 --- cmake/FindGoogleTest.cmake | 9 ++++++++- src/Unittests/CMakeLists.txt | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake/FindGoogleTest.cmake b/cmake/FindGoogleTest.cmake index a77bf7d4..cddd992e 100644 --- a/cmake/FindGoogleTest.cmake +++ b/cmake/FindGoogleTest.cmake @@ -51,6 +51,11 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ~/sw/gtest/lib /opt/local/lib /usr/local/lib) + + if ( _GTEST_LIBRARY ) + get_filename_component(_GTEST_LIBRARY_DIR ${_GTEST_LIBRARY} PATH CACHE ) + endif() + endif(GTEST_PREFIX) if(_GTEST_INCLUDE_DIR AND _GTEST_LIBRARY AND _GTEST_MAIN_LIBRARY) set(GTEST_FOUND true) @@ -60,7 +65,9 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) "Libraries to link for Google Test framework") set(GTEST_MAIN_LIBRARIES ${_GTEST_MAIN_LIBRARY} CACHE FILEPATH "Libraries to link for Google Test automatic main() definition") - mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES) + set(GTEST_LIBRARY_DIR ${_GTEST_LIBRARY_DIR} CACHE FILEPATH + "Library dir containing Google Test libraries") + mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR ) if(NOT GoogleTest_FIND_QUIETLY) message(STATUS "Found Google Test: ${GTEST_LIBRARIES}") endif(NOT GoogleTest_FIND_QUIETLY) diff --git a/src/Unittests/CMakeLists.txt b/src/Unittests/CMakeLists.txt index e8beee1b..ec161e72 100644 --- a/src/Unittests/CMakeLists.txt +++ b/src/Unittests/CMakeLists.txt @@ -16,6 +16,8 @@ if(GTEST_FOUND) add_executable(unittests EXCLUDE_FROM_ALL unittests.cc) # Link against all necessary libraries target_link_libraries(unittests OpenMeshCore OpenMeshTools gtest gtest_main pthread) + # set additional link directories + link_directories(${GTEST_LIBRARY_DIR} ) # Set output directory to ${BINARY_DIR}/Unittests set_target_properties(unittests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Unittests) # Set compiler flags