From 39e73a3b7b26dfa95814c3e2d569dd8522f25c2e Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 3 Nov 2011 21:17:49 +0000 Subject: QPID-3464: Build Improvements (CMake) - Fixed windows build git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1197312 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 2736500b45..a903de2cc2 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -460,12 +460,14 @@ else (NOT CLOCK_GETTIME_IN_RT) set(QPID_HAS_CLOCK_GETTIME YES CACHE BOOL "Platform has clock_gettime") endif (NOT CLOCK_GETTIME_IN_RT) -# Ensure that we have uuid library -CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID) -CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H) -IF (NOT HAVE_UUID AND NOT HAVE_UUID_H) - message(FATAL_ERROR "Uuid library and/or header file not found") -ENDIF (NOT HAVE_UUID AND NOT HAVE_UUID_H) +# If not windows ensure that we have uuid library +if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID) + CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H) + if (NOT HAVE_UUID AND NOT HAVE_UUID_H) + message(FATAL_ERROR "Uuid library and/or header file not found") + endif (NOT HAVE_UUID AND NOT HAVE_UUID_H) +endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) # See if Cyrus SASL is desired and available CHECK_LIBRARY_EXISTS (sasl2 sasl_checkpass "" HAVE_SASL) -- cgit v1.2.1