Commit 72646c2e authored by Javier G. Sogo's avatar Javier G. Sogo Committed by Jay Satiro
Browse files

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
parent 4201e4a9

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -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.