aboutsummaryrefslogtreecommitdiffstats
path: root/host/Modules
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-04-05 16:32:48 -0700
committerJosh Blum <josh@joshknows.com>2011-04-05 16:32:48 -0700
commitdbfbc497a8e0a144e0db2b8daa0f4baba5284775 (patch)
tree91e52b36dc45eea92974449105c79f1048edaf10 /host/Modules
parent6a2fbe07e7674794a883a7062ce2225781cf5193 (diff)
downloaduhd-dbfbc497a8e0a144e0db2b8daa0f4baba5284775.tar.gz
uhd-dbfbc497a8e0a144e0db2b8daa0f4baba5284775.tar.bz2
uhd-dbfbc497a8e0a144e0db2b8daa0f4baba5284775.zip
uhd: tweaks for cygwin/mingw, always link winsock2, findusb1, __USE_W32_SOCKETS
Diffstat (limited to 'host/Modules')
-rw-r--r--host/Modules/FindUSB1.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/Modules/FindUSB1.cmake b/host/Modules/FindUSB1.cmake
index ebcac99eb..efb2e288b 100644
--- a/host/Modules/FindUSB1.cmake
+++ b/host/Modules/FindUSB1.cmake
@@ -17,12 +17,12 @@ if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
set(LIBUSB_FOUND TRUE)
else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
- IF (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_LIBUSB libusb-1.0)
- ENDIF(NOT WIN32)
+ IF(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_LIBUSB libusb-1.0)
+ ENDIF(PKG_CONFIG_FOUND)
FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})