1
0
Fork 0

comment out install targets since we don't want to ship curl binaries

This commit is contained in:
Wilfried Goesgens 2016-10-26 17:55:50 +02:00
parent dada6ad399
commit 8e2e86792a
3 changed files with 26 additions and 26 deletions

View File

@ -1177,20 +1177,20 @@ set(REQUIRE_LIB_DEPS "no")
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 "${CURL_BINARY_DIR}/curl-config"
DESTINATION bin
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
# 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 "${CURL_BINARY_DIR}/libcurl.pc"
DESTINATION lib/pkgconfig)
#configure_file("${CURL_SOURCE_DIR}/curl-config.in"
# "${CURL_BINARY_DIR}/curl-config" @ONLY)
#install(FILES "${CURL_BINARY_DIR}/curl-config"
# DESTINATION bin
# PERMISSIONS
# OWNER_READ OWNER_WRITE OWNER_EXECUTE
# GROUP_READ GROUP_EXECUTE
# WORLD_READ WORLD_EXECUTE)
#
## 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 "${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.
if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE)
@ -1199,13 +1199,13 @@ endif()
# Installation.
# First, install generated curlbuild.h
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/curl/curlbuild.h"
DESTINATION include/curl )
# Next, install other headers excluding curlbuild.h
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"
DESTINATION include
FILES_MATCHING PATTERN "*.h"
PATTERN "curlbuild.h" EXCLUDE)
#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/curl/curlbuild.h"
# DESTINATION include/curl )
## Next, install other headers excluding curlbuild.h
#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"
# DESTINATION include
# FILES_MATCHING PATTERN "*.h"
# PATTERN "curlbuild.h" EXCLUDE)
# Workaround for MSVS10 to avoid the Dialog Hell

View File

@ -103,7 +103,7 @@ if(WIN32)
endif()
endif()
install(TARGETS ${LIB_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
#install(TARGETS ${LIB_NAME}
# ARCHIVE DESTINATION lib
# LIBRARY DESTINATION lib
# RUNTIME DESTINATION bin)

View File

@ -76,4 +76,4 @@ set_target_properties(${EXE_NAME} PROPERTIES
#INCLUDE(ModuleInstall OPTIONAL)
install(TARGETS ${EXE_NAME} DESTINATION bin)
# install(TARGETS ${EXE_NAME} DESTINATION bin)