From ec63619f611c7246247485ae3d27818aa2aa1dbd Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Mon, 24 Aug 2009 17:59:35 +0200 Subject: ZLP flag is an enum, move check into CMake. Now prints the big fat warning at configure time --- Modules/CheckConstantExists.cmake | 38 ++++++++++++++++++++++++++++++++++++++ Modules/FindUSB.cmake | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Modules/CheckConstantExists.cmake (limited to 'Modules') diff --git a/Modules/CheckConstantExists.cmake b/Modules/CheckConstantExists.cmake new file mode 100644 index 0000000..3d6d97e --- /dev/null +++ b/Modules/CheckConstantExists.cmake @@ -0,0 +1,38 @@ +# - Check if the given constant exists (as an enum, define, or whatever) +# CHECK_CONSTANT_EXISTS (CONSTANT HEADER VARIABLE) +# +# CONSTANT - the name of the constant you are interested in +# HEADER - the header(s) where the prototype should be declared +# VARIABLE - variable to store the result +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# +# Example: CHECK_CONSTANT_EXISTS(O_NOFOLLOW fcntl.h HAVE_O_NOFOLLOW) + + +INCLUDE(CheckCSourceCompiles) + +MACRO (CHECK_CONSTANT_EXISTS _CONSTANT _HEADER _RESULT) + SET(_INCLUDE_FILES) + FOREACH (it ${_HEADER}) + SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n") + ENDFOREACH (it) + + SET(_CHECK_CONSTANT_SOURCE_CODE " +${_INCLUDE_FILES} +void cmakeRequireConstant(int dummy,...){(void)dummy;} +int main() +{ + cmakeRequireConstant(0,${_CONSTANT}); + return 0; +} +") + CHECK_C_SOURCE_COMPILES("${_CHECK_CONSTANT_SOURCE_CODE}" ${_RESULT}) + +ENDMACRO (CHECK_CONSTANT_EXISTS) + diff --git a/Modules/FindUSB.cmake b/Modules/FindUSB.cmake index d562b98..8659ec2 100644 --- a/Modules/FindUSB.cmake +++ b/Modules/FindUSB.cmake @@ -10,7 +10,7 @@ include(LibFindMacros) # Dependencies # Use pkg-config to get hints about paths -libfind_pkg_check_modules(USB_PKGCONF libusb-1.0) +libfind_pkg_check_modules(USB_PKGCONF libusb-1.0>=1.0.2) # Include dir find_path(USB_INCLUDE_DIR -- cgit v1.1-32-gdbae