From 10cdbc4fa08ecada6991911aaf930876830b10c0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 17 Feb 2015 15:33:26 -0800 Subject: [PATCH] fix dynamic requirements in find modules --- cmake/modules/FindLeapMotion.cmake | 4 ++-- cmake/modules/FindSDL2.cmake | 2 +- cmake/modules/FindSixense.cmake | 2 +- cmake/modules/FindTBB.cmake | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindLeapMotion.cmake b/cmake/modules/FindLeapMotion.cmake index 6b9d4355f7..6f177cd3d7 100644 --- a/cmake/modules/FindLeapMotion.cmake +++ b/cmake/modules/FindLeapMotion.cmake @@ -29,7 +29,7 @@ endif () include(SelectLibraryConfigurations) select_library_configurations(LEAPMOTION) -set(LEAPMOTION_LIBRARIES "${LEAPMOTION_LIBRARY}") +set(LEAPMOTION_LIBRARIES ${LEAPMOTION_LIBRARY}) set(LEAPMOTION_REQUIREMENTS LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES) if (WIN32) @@ -37,7 +37,7 @@ if (WIN32) endif () include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(LeapMotion DEFAULT_MSG LEAPMOTION_REQUIREMENTS) +find_package_handle_standard_args(LeapMotion DEFAULT_MSG ${LEAPMOTION_REQUIREMENTS}) if (WIN32) add_paths_to_lib_paths(${LEAPMOTION_DLL_PATH}) diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake index b42cacb16a..55dae82f82 100644 --- a/cmake/modules/FindSDL2.cmake +++ b/cmake/modules/FindSDL2.cmake @@ -266,7 +266,7 @@ if (WIN32) list(APPEND SDL2_REQUIREMENTS SDL2_DLL_PATH) endif () -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_REQUIREMENTS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS ${SDL2_REQUIREMENTS}) if (WIN32) add_paths_to_lib_paths(${SDL2_DLL_PATH}) diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake index 7e6581ffd0..11ca704407 100644 --- a/cmake/modules/FindSixense.cmake +++ b/cmake/modules/FindSixense.cmake @@ -48,7 +48,7 @@ endif () set(SIXENSE_LIBRARIES "${SIXENSE_LIBRARY}") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Sixense DEFAULT_MSG SIXENSE_REQUIREMENTS) +find_package_handle_standard_args(Sixense DEFAULT_MSG ${SIXENSE_REQUIREMENTS}) if (WIN32) add_paths_to_lib_paths(${SIXSENSE_DEBUG_DLL_PATH}) diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index c18d619612..9781154c1a 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -85,7 +85,7 @@ if (WIN32) list(APPEND TBB_REQUIREMENTS TBB_DLL_PATH) endif () -find_package_handle_standard_args(TBB DEFAULT_MSG TBB_REQUIREMENTS) +find_package_handle_standard_args(TBB DEFAULT_MSG ${TBB_REQUIREMENTS}) if (WIN32) add_paths_to_lib_paths(${TBB_DLL_PATH})