38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
diff -u a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2018-11-19 04:28:50.106323417 +0100
|
|
+++ b/CMakeLists.txt 2018-11-19 04:30:26.045870468 +0100
|
|
@@ -89,7 +89,6 @@
|
|
target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS})
|
|
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0)
|
|
|
|
-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList})
|
|
|
|
# Make sure that on unix-platforms shared and static libraries have
|
|
# the same root name, but different suffixes.
|
|
@@ -97,18 +96,15 @@
|
|
# (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F)
|
|
#
|
|
# Making shared and static libraries have the same root name, but different suffixes
|
|
-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
|
|
# Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools.
|
|
# This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll",
|
|
# so we add a "lib" prefix (which is default on other platforms anyway):
|
|
-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib")
|
|
-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS})
|
|
|
|
# install headers
|
|
install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp")
|
|
install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp")
|
|
|
|
-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
|
|
+install(TARGETS ${PROJECT_NAME}
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
Gemeinsame Unterverzeichnisse: a/doc und b/doc.
|
|
Gemeinsame Unterverzeichnisse: a/examples und b/examples.
|
|
Gemeinsame Unterverzeichnisse: a/extras und b/extras.
|
|
Gemeinsame Unterverzeichnisse: a/.git und b/.git.
|
|
Gemeinsame Unterverzeichnisse: a/include und b/include.
|
|
Gemeinsame Unterverzeichnisse: a/src und b/src.
|