diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-04-21 15:03:04 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-04-21 15:03:26 +0200 |
| commit | 3057c6cd736dc40483311ee73f7b697cf519158b (patch) | |
| tree | 9ea258fb76a41e28694fa2e9352a2a46f7b46ac1 | |
| parent | dd2bb485521c2ec713001b3a7356555dd893e2e6 (diff) | |
| download | curl-3057c6cd736dc40483311ee73f7b697cf519158b.tar.gz | |
Revert "cmake: make libcurl library output name configurable"
This reverts commit 1cba36d2166c396f987eea587cf92671b27acb92.
CMake provides properties that can be set on a target to rename the
output artifact without changing the name of a target.
Ref: #6899
| -rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/libtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/unit/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 37ce1c8e2..a58b47b86 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3804c26b1..0982cfe6e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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}) ################################################################################ diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 43a6c41a7..2bcf77874 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -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}) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 889c792d3..a680c5308 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -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() |