From 2dafbbbfb6e59b676600c276f7f14bbae08fabb0 Mon Sep 17 00:00:00 2001 From: Allen Winter <winter@kde.org> Date: Mon, 20 Jul 2015 10:14:36 -0400 Subject: [PATCH 05/47] FindLibical.cmake - using LINK_LIBRARIES in try_run --- cmake/modules/FindLibical.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindLibical.cmake b/cmake/modules/FindLibical.cmake index e722d9bb1..a37db815f 100644 --- a/cmake/modules/FindLibical.cmake +++ b/cmake/modules/FindLibical.cmake @@ -53,14 +53,14 @@ if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES) set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx) file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}") - set(FIND_LIBICAL_VERSION_ADD_INCLUDES - "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS}") + set(TRY_CMAKE_FLAGS + "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS} -DLINK_LIBRARIES:STRING=${LIBICAL_LIBRARIES}") if(NOT CMAKE_CROSSCOMPILING) try_run(RUN_RESULT COMPILE_RESULT ${CMAKE_BINARY_DIR} ${FIND_LIBICAL_VERSION_SOURCE_FILE} - CMAKE_FLAGS "${FIND_LIBICAL_VERSION_ADD_INCLUDES}" + CMAKE_FLAGS "${TRY_CMAKE_FLAGS}" RUN_OUTPUT_VARIABLE LIBICAL_VERSION) endif() @@ -96,4 +96,3 @@ include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS) mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES) - -- 2.14.1