From: Javier G. Sogo Date: Mon, 19 Oct 2015 14:09:14 +0000 (+0200) Subject: cmake: Fix for add_subdirectory(curl) use-case X-Git-Tag: curl-7_46_0~143 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72646c2e48a819715d2b57ca964f7cda2ef8af2c;p=curl cmake: Fix for add_subdirectory(curl) use-case - 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 https://github.com/bagder/curl/pull/488 Closes https://github.com/bagder/curl/pull/498 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 02fa8db97..858ac77f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1153,7 +1153,7 @@ set(VERSIONNUM "${CURL_VERSION_NUM}") # Finally generate a "curl-config" matching this config configure_file("${CURL_SOURCE_DIR}/curl-config.in" "${CURL_BINARY_DIR}/curl-config" @ONLY) -install(FILES "${CMAKE_BINARY_DIR}/curl-config" +install(FILES "${CURL_BINARY_DIR}/curl-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE @@ -1163,7 +1163,7 @@ install(FILES "${CMAKE_BINARY_DIR}/curl-config" # Finally generate a pkg-config file matching this config configure_file("${CURL_SOURCE_DIR}/libcurl.pc.in" "${CURL_BINARY_DIR}/libcurl.pc" @ONLY) -install(FILES "${CMAKE_BINARY_DIR}/libcurl.pc" +install(FILES "${CURL_BINARY_DIR}/libcurl.pc" DESTINATION lib/pkgconfig) # This needs to be run very last so other parts of the scripts can take advantage of this.