From fd23fb66abeaa7c67829d7ec3b51cf9713b08204 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 24 Oct 2014 10:42:29 -0700 Subject: [PATCH] bubble up ATL_INCLUDE_DIRS from FindATL module --- cmake/modules/FindATL.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindATL.cmake b/cmake/modules/FindATL.cmake index f95b0267eb..24a21643d6 100644 --- a/cmake/modules/FindATL.cmake +++ b/cmake/modules/FindATL.cmake @@ -16,8 +16,11 @@ # if (WIN32) - find_library(ATL_LIBRARY_RELEASE atls PATH_SUFFIXES "7600.16385.1/lib/ATL/i386" HINTS "C:\\WinDDK") - find_library(ATL_LIBRARY_DEBUG atlsd PATH_SUFFIXES "7600.16385.1/lib/ATL/i386" HINTS "C:\\WinDDK") + set(ATL_SEARCH_DIRS "C:\\WinDDK") + find_path(ATL_INCLUDE_DIRS atlbase.h PATH_SUFFIXES "7600.16385.1/inc/atl71" HINTS ${ATL_SEARCH_DIRS}) + + find_library(ATL_LIBRARY_RELEASE atls PATH_SUFFIXES "7600.16385.1/lib/ATL/i386" HINTS ${ATL_SEARCH_DIRS}) + find_library(ATL_LIBRARY_DEBUG atlsd PATH_SUFFIXES "7600.16385.1/lib/ATL/i386" HINTS ${ATL_SEARCH_DIRS}) include(SelectLibraryConfigurations) select_library_configurations(ATL) @@ -26,4 +29,4 @@ endif () set(ATL_LIBRARIES "${ATL_LIBRARY}") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(ATL DEFAULT_MSG ATL_LIBRARIES) \ No newline at end of file +find_package_handle_standard_args(ATL DEFAULT_MSG ATL_LIBRARIES ATL_INCLUDE_DIRS) \ No newline at end of file