mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
Revert "cmake: make libcurl library output name configurable"
This reverts commit 1cba36d216
.
CMake provides properties that can be set on a target to rename the
output artifact without changing the name of a target.
Ref: #6899
This commit is contained in:
parent
dd2bb48552
commit
3057c6cd73
@ -19,7 +19,7 @@
|
||||
# KIND, either express or implied.
|
||||
#
|
||||
###########################################################################
|
||||
set(LIB_NAME libcurl CACHE STRING "Basename of the curl library")
|
||||
set(LIB_NAME libcurl)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
set(CURL_STATICLIB NO)
|
||||
|
@ -97,7 +97,7 @@ include_directories(
|
||||
)
|
||||
|
||||
#Build curl executable
|
||||
target_link_libraries(${EXE_NAME} ${LIB_NAME} ${CURL_LIBS})
|
||||
target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS})
|
||||
|
||||
################################################################################
|
||||
|
||||
|
@ -36,7 +36,7 @@ function(setup_test TEST_NAME) # ARGN are the files in the test
|
||||
include_directories(${CARES_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
target_link_libraries(${TEST_NAME} ${LIB_NAME} ${CURL_LIBS})
|
||||
target_link_libraries(${TEST_NAME} libcurl ${CURL_LIBS})
|
||||
|
||||
set_target_properties(${TEST_NAME}
|
||||
PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME})
|
||||
|
@ -63,7 +63,7 @@ foreach(_testfile ${UT_SRC})
|
||||
get_filename_component(_testname ${_testfile} NAME_WE)
|
||||
add_executable(${_testname} EXCLUDE_FROM_ALL ${_testfile} ${UT_COMMON_FILES})
|
||||
#add_dependencies(testdeps ${_testname})
|
||||
target_link_libraries(${_testname} ${LIB_NAME} ${CURL_LIBS})
|
||||
target_link_libraries(${_testname} libcurl ${CURL_LIBS})
|
||||
set_target_properties(${_testname}
|
||||
PROPERTIES COMPILE_DEFINITIONS "UNITTESTS")
|
||||
endforeach()
|
||||
|
Loading…
Reference in New Issue
Block a user