From 42d268c2c999ed43fd89f3a8bfeca614e184d951 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Sun, 26 May 2013 04:17:18 +0900 Subject: [PATCH] Fixed shlwapi.h and shlwapi.lib detection for MSVC --- ConfigureChecks.cmake | 2 +- taglib/CMakeLists.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index eda7a2b6..192c1441 100755 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -219,7 +219,7 @@ endif() set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -if(WIN32) +if(WIN32 AND NOT MSVC) find_package(SHLWAPI) if(SHLWAPI_FOUND) set(HAVE_SHLWAPI 1) diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt index 03eb15b5..1753fa33 100755 --- a/taglib/CMakeLists.txt +++ b/taglib/CMakeLists.txt @@ -30,7 +30,7 @@ if(ZLIB_FOUND) include_directories(${ZLIB_INCLUDE_DIR}) endif() -if(SHLWAPI_FOUND) +if(NOT MSVC AND SHLWAPI_FOUND) include_directories(${SHLWAPI_INCLUDE_DIR}) endif() @@ -315,8 +315,12 @@ if(ZLIB_FOUND) target_link_libraries(tag ${ZLIB_LIBRARIES}) endif() -if(SHLWAPI_FOUND) - target_link_libraries(tag ${SHLWAPI_LIBRARIES}) +if(MSVC) + target_link_libraries(tag shlwapi.lib) +else() + if(SHLWAPI_FOUND) + target_link_libraries(tag ${SHLWAPI_LIBRARIES}) + endif() endif() set_target_properties(tag PROPERTIES