Find install files in Windows #488

jgsogo · 2015-10-13T15:14:02Z

Working with CMake 3.1.0 in Win7 64bits. Variables CMAKE_BINARY_DIR and CURL_BINARY_DIR seems not to be the same.

bagder · 2015-10-17T21:41:02Z

snikulov · 2015-10-19T09:33:52Z

@jgsogo @bagder according to the documentation https://cmake.org/cmake/help/v3.0/variable/PROJECT-NAME_BINARY_DIR.html and https://cmake.org/cmake/help/v3.0/variable/CMAKE_BINARY_DIR.html in CURL project case should be the same.

So this change make no sense to me.
If it solves some problem for @jgsogo - let's merge.

@bradking Could you please check?

jgsogo · 2015-10-19T10:13:34Z

I purpose those changes to compile library whoshuu/cpr. As you can see here CURL is being added to the main project with an add_subdirectory(curl) and so it happends that those variables take different values:

${CURL_BINARY_DIR} = <my-path>/skystrife/cpr/build_2015/opt/curl
${CMAKE_BINARY_DIR} = <my-path>/skystrife/cpr/build_2015

Also it seems more logical to me, as file was generated to ${CURL_BINARY_DIR}, why not install it also from the same dir?

Nevertheless, I have a pending PR to whoshuu/cpr in which I include CURL using CMake ExternalProject_Add, and in this case both variables take the same value:

${CURL_BINARY_DIR}/${CMAKE_BINARY_DIR} = <my-path>/skystrife/cpr/build_2015/opt/external/curl/src/curl-build

I want to cc @whoshuu because this PR is related to the use-case in his CPR library. If that PR goes ahead, then this one can be ignored.

snikulov · 2015-10-19T10:22:38Z

@jgsogo Ahh... That make sense. I use ExternalProject_Add mostly, so I've not covered add_subdirectory case.

👍

bradking · 2015-10-19T12:49:20Z

This change LGTM. However, please revise the commit message to explain the use case so that future readers understand the motivation discussed here.

This option disables any attempts in configure to create dependency on stuff requiring linking to librt.so and libpthread.so, in this case this means clock_gettime(CLOCK_MONOTONIC, &mt). We were in need to build curl which doesn't link libpthread.so to avoid the following bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16628.

MSVC 12 complains: lib\vtls\openssl.c(1554): warning C4701: potentially uninitialized local variable 'verstr' used It's a false positive, but as it's normally not, I have enabled warning-as-error for that warning.

Currently, libcurl rejects responses with "Content-Encoding: compress" when CURLOPT_ACCEPT_ENCODING is set to "". I think that libcurl should treat the Content-Encoding "compress" the same as other Content-Encodings that it does not support, e.g. "bzip2". That means just ignoring it.

To make it easier to link with static versions of OpenSSL, the configure script now checks if -ldl is needed for linking. Help-by: TJ Saunders

- Set CURLOPT_SSL_OPTIONS only if the tool enabled an SSL option. Broken by me several days ago in 172b2be. curl@172b2be#diff-70b44ee478e58d4e1ddcf9c9a73d257b Bug: http://curl.haxx.se/mail/lib-2015-07/0119.html Reported-by: Dan Fandrich

Closes curl#349 for now

Closes curl#322 for now

Closes curl#355

...as well as some wording.

This is a new document to consolidate our thread safety information from several documents (curl-www:features, libcurl.3, libcurl-tutorial.3). Each document's section on multi-threading will now point to this one.

.. also update formatting and add WinSSL and wolfSSL to the SSL/TLS handlers list.

Following commit 957fcd9 and in preparation for adding the VC14 project files renamed the curl source project files.

This wasn't possible with the old curlsrc project filenames, but like commit 2a615a2 and 11397eb for libcurl use the built in Visual Studio macros for the output filenames.

Visual Studio project files and updates to makefile.am to follow.

Whilst there are no coding standards for the batch files used in curl, most tend to use lower-case for keywords and upper-case for variables.

Updates to Makefile.am for the generation of the project files in the tarball to follow.

Because the 'not' operator has a very low precedence and as a result the entire statement was erroneously negated and could never be true.

Closes curl#466

Closes curl#469

Closes curl#471

- If a CURLINFO option is unknown return CURLE_UNKNOWN_OPTION. Prior to this change CURLE_BAD_FUNCTION_ARGUMENT was returned on unknown. That return value is contradicted by the CURLINFO option documentation which specifies a return of CURLE_UNKNOWN_OPTION on unknown.

'make V=1' will make the build verbose like before

Follow up to 613e502.

... since some compilers don't have it and instead use other types, such as __int64. Reported by: gkinseyhpw Closes curl#478

Closes curl#479

If the underlying recv called by http2_recv returns -1 then that is the value http2_recv returns to the caller.

... as in the polarssl TLS backend for example it uses memory functions.

follow-up from 6f8ecea

It makes it a clearer message for developers reaching that point without the necessary support. Thanks-by: Jay Satiro Closes curl#78

sk_X509_pop will decrease the size of the stack which means that the loop would end after having added only half of the certificates. Also make sure that the X509 certificate is freed in case SSL_CTX_add_extra_chain_cert fails.

... and allow it to get set by a caller easier. Reported-by: Rainer Jung Bug: http://curl.haxx.se/mail/lib-2015-10/0035.html

jgsogo · 2015-10-19T14:15:44Z

I have tried to rewrite commit message but I messed up it all 😫 (I was following this tuto... I'll try it again with a repo of mine).

I've created this clean PR with a proper message. Sorry for the incovenience.

- Use CURL_BINARY_DIR instead of CMAKE_BINARY_DIR. When including CURL using add_subdirectory the variables CMAKE_BINARY_DIR and CURL_BINARY_DIR hold different paths. Closes #488 Closes #498

jgsogo mentioned this pull request Oct 13, 2015

Update CURL libcpr/cpr#55

Closed

bagder added build cmake labels Oct 17, 2015

michalfita and others added 22 commits October 19, 2015 15:50

openssl: work around MSVC warning

b5204b7

MSVC 12 complains: lib\vtls\openssl.c(1554): warning C4701: potentially uninitialized local variable 'verstr' used It's a false positive, but as it's normally not, I have enabled warning-as-error for that warning.

configure: check if OpenSSL linking wants -ldl

2d6e290

To make it easier to link with static versions of OpenSSL, the configure script now checks if -ldl is needed for linking. Help-by: TJ Saunders

1.11 minimize dependencies with dynamicly loaded modules

a60d994

Closes curl#349 for now

TODO: improve how curl works in a windows console window

cf171bf

Closes curl#322 for now

build-openssl.bat: Show syntax if required args are missing

0813b88

comment: fix comment about adding new option support

9276db5

test1902: attempt to make the test more reliable

d4a3bb1

Closes curl#355

RELEASE-NOTES: synced with 0f645ad

b2cca3a

build-openssl.bat: Added support for VC14

7413785

README: Corrected formatting for 'Legacy Windows and SSL' section

6ce3a20

...as well as some wording.

libcurl-thread.3: Consolidate thread safety info

da1c5a6

This is a new document to consolidate our thread safety information from several documents (curl-www:features, libcurl.3, libcurl-tutorial.3). Each document's section on multi-threading will now point to this one.

libcurl-thread.3: Revert to stricter handle wording

6054a6f

.. also update formatting and add WinSSL and wolfSSL to the SSL/TLS handlers list.

build: Renamed curl src Visual Studio project files

805948b

Following commit 957fcd9 and in preparation for adding the VC14 project files renamed the curl source project files.

build: Use $(ProjectName) macro for curl.exe and curld.exe filenames

66e8f06

This wasn't possible with the old curlsrc project filenames, but like commit 2a615a2 and 11397eb for libcurl use the built in Visual Studio macros for the output filenames.

build: Fixed missing .opensdf files from VC10+ .gitignore files

13e80c3

build: Added initial VC14 support to generate.bat

30d9219

Visual Studio project files and updates to makefile.am to follow.

generate.bat: Use lower-case for commands and reserved keywords

a9abf15

Whilst there are no coding standards for the batch files used in curl, most tend to use lower-case for keywords and upper-case for variables.

libcurl-thread.3: Clarify CURLOPT_NOSIGNAL takes long value 1L

099eb63

build: Added VC14 project files

2d99bf4

Updates to Makefile.am for the generation of the project files in the tarball to follow.

ams-tschoening and others added 24 commits October 19, 2015 15:52

win32: make recent Borland compilers use long long

24eb570

runtests: Fix pid check in checkdied

97946be

Because the 'not' operator has a very low precedence and as a result the entire statement was erroneously negated and could never be true.

gopher: don't send NUL byte

58f9912

Closes curl#466

tool_setopt: fix c_escape truncated octal

6e465d0

Closes curl#469

hiperfifo: fix the pointer passed to WRITEDATA

55b0f7e

Closes curl#471

RELEASE-NOTES: synced with 69ea579

7e0ffc5

THANKS: 19 new contributors from the 7.45.0 announcement

8cad1d1

RELEASE-PROCEDURE: add the github HTTPS download step

ec83191

bump: start climbing toward 7.46.0

448e093

configure: build silently by default

ef17e8f

'make V=1' will make the build verbose like before

des: Fix header conditional for Curl_des_set_odd_parity

96e1441

Follow up to 613e502.

ntlm: get rid of unconditional use of long long

c16f704

... since some compilers don't have it and instead use other types, such as __int64. Reported by: gkinseyhpw Closes curl#478

CURLOPT_CERTINFO.3: fix reference to CURLINFO_CERTINFO

6b3a031

CURLOPT_CONNECT_ONLY.3: CURLINFO_LASTSOCKET => CURLINFO_ACTIVESOCKET

9d2683d

curl_easy_send.3: CURLINFO_LASTSOCKET => CURLINFO_ACTIVESOCKET

9c72d33

curl_easy_recv.3: CURLINFO_LASTSOCKET => CURLINFO_ACTIVESOCKET

fc48097

Closes curl#479

http2: Fix http2_recv to return -1 if recv returned -1

7a4fcae

If the underlying recv called by http2_recv returns -1 then that is the value http2_recv returns to the caller.

curl_global_init_mem: set function pointers before doing init

61c038e

... as in the polarssl TLS backend for example it uses memory functions.

curl_global_init: set the memory function pointers correct

697a21c

follow-up from 6f8ecea

ntlm: error out without 64bit support as the code needs it

9bffd5d

It makes it a clearer message for developers reaching that point without the necessary support. Thanks-by: Jay Satiro Closes curl#78

docs/INSTALL: Updated example minimal binary sizes

b0e53b6

acinclude: remove PKGCONFIG override

da5b6b0

... and allow it to get set by a caller easier. Reported-by: Rainer Jung Bug: http://curl.haxx.se/mail/lib-2015-10/0035.html

jgsogo force-pushed the bagder-msvc2015 branch from 13b2b3d to da5b6b0 Compare October 19, 2015 13:57

jgsogo mentioned this pull request Oct 19, 2015

Find CMake files for add_subdirectory(curl) use-case #498

Closed

jgsogo closed this Oct 19, 2015

lock bot locked as resolved and limited conversation to collaborators Jan 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Find install files in Windows #488

Find install files in Windows #488

jgsogo commented Oct 13, 2015

bagder commented Oct 17, 2015

snikulov commented Oct 19, 2015

jgsogo commented Oct 19, 2015

snikulov commented Oct 19, 2015

bradking commented Oct 19, 2015

jgsogo commented Oct 19, 2015

Find install files in Windows #488

Find install files in Windows #488

Conversation

jgsogo commented Oct 13, 2015

bagder commented Oct 17, 2015

snikulov commented Oct 19, 2015

jgsogo commented Oct 19, 2015

snikulov commented Oct 19, 2015

bradking commented Oct 19, 2015

jgsogo commented Oct 19, 2015