From 72927d983f1f84127e83bf2d80db6b8ee882bad7 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 26 Mar 2010 15:56:04 -0800 Subject: library loading on windows, status message tweaks, warning tweaks --- host/lib/CMakeLists.txt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'host/lib/CMakeLists.txt') diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 4dd638336..a0bfd6d0a 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -60,31 +60,35 @@ LIST(APPEND libuhd_sources ######################################################################## # Setup defines for module loading ######################################################################## +MESSAGE(STATUS "Configuring module loading...") + INCLUDE(CheckIncludeFileCXX) CHECK_INCLUDE_FILE_CXX(dlfcn.h HAVE_DLFCN_H) -CHECK_INCLUDE_FILE_CXX(Winbase.h HAVE_WINBASE_H) +CHECK_INCLUDE_FILE_CXX(Windows.h HAVE_WINDOWS_H) IF(HAVE_DLFCN_H) - MESSAGE(STATUS "Module loading supported through dlopen...") + MESSAGE(STATUS " Module loading supported through dlopen.") ADD_DEFINITIONS(-DHAVE_DLFCN_H) -ELSEIF(HAVE_WINBASE_H) - MESSAGE(STATUS "Module loading supported through LoadLibrary...") - ADD_DEFINITIONS(-DHAVE_WINBASE_H) +ELSEIF(HAVE_WINDOWS_H) + MESSAGE(STATUS " Module loading supported through LoadLibrary.") + ADD_DEFINITIONS(-DHAVE_WINDOWS_H) ELSE(HAVE_DLFCN_H) - MESSAGE(STATUS "Module loading not supported...") + MESSAGE(STATUS " Module loading not supported.") ENDIF(HAVE_DLFCN_H) ######################################################################## # Setup defines for interface address discovery ######################################################################## +MESSAGE(STATUS "Configuring interface address discovery...") + INCLUDE(CheckIncludeFileCXX) CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H) IF(HAVE_IFADDRS_H) - MESSAGE(STATUS "Interface address discovery supported through getifaddrs...") + MESSAGE(STATUS " Interface address discovery supported through getifaddrs.") ADD_DEFINITIONS(-DHAVE_IFADDRS_H) ELSE(HAVE_IFADDRS_H) - MESSAGE(STATUS "Interface address discovery not supported...") + MESSAGE(STATUS " Interface address discovery not supported.") ENDIF(HAVE_IFADDRS_H) ######################################################################## -- cgit v1.2.3