diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-03-24 10:57:54 -0400 |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-03-24 10:57:54 -0400 |
commit | d42f9329dc52200e3964d1060f373368f401b828 (patch) | |
tree | 5c9883a0999d5f2e0f7e247d22512411caccb483 /lib | |
parent | 9828b926ae9204e3a7d7699fc1a5a76b5520c987 (diff) |
Fix curl CMake build.
This commit fixes the cmake build of curl, and cleans up the
cmake code a little. It removes some commented out code and
some trailing whitespace. To get curl to build the binary
tree include/curl directory needed to be added to the include
path. Also, SIZEOF_SHORT needed to be added. A check for the
lack of defines of SIZEOF_* for warnless.c was added.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
-rw-r--r-- | lib/warnless.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 09f435c35..fd6b32aa8 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -853,6 +853,9 @@ /* The size of `int', as computed by sizeof. */ #cmakedefine SIZEOF_INT ${SIZEOF_INT} +/* The size of `short', as computed by sizeof. */ +#cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT} + /* The size of `long', as computed by sizeof. */ #cmakedefine SIZEOF_LONG ${SIZEOF_LONG} diff --git a/lib/warnless.c b/lib/warnless.c index 778a12fac..f19bbe398 100644 --- a/lib/warnless.c +++ b/lib/warnless.c @@ -36,6 +36,8 @@ #elif (SIZEOF_SHORT == 8) # define CURL_MASK_SSHORT 0x7FFFFFFFFFFFFFFF # define CURL_MASK_USHORT 0xFFFFFFFFFFFFFFFF +#else +# error "SIZEOF_SHORT not defined" #endif #if (SIZEOF_INT == 2) @@ -50,6 +52,8 @@ #elif (SIZEOF_INT == 16) # define CURL_MASK_SINT 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF # define CURL_MASK_UINT 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +#else +# error "SIZEOF_INT not defined" #endif #if (CURL_SIZEOF_LONG == 2) @@ -64,6 +68,8 @@ #elif (SIZEOF_LONG == 16) # define CURL_MASK_SLONG 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL # define CURL_MASK_ULONG 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFUL +#else +# error "SIZEOF_LONG not defined" #endif /* |