Skip to content

Commit

Permalink
remove libcurl find_package workaround
Browse files Browse the repository at this point in the history
- on a second try I coudn't reproduce the issues?
  Reverting the "fix"
- I also could not reproduce the crash on Windows. Updating Readme.
  • Loading branch information
jothepro committed Dec 13, 2021
1 parent 69cc617 commit c12562e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ In your Nextcloud installation go to <kbd>settings</kbd> > <kbd>user</kbd> > <k

- Implement equality operators for Cloud, Directory, File
- Add tests for CURL wrapper (e.g. by going against a (mocked?) http server)
- implementing support for big file upload/download (chunked upload/download)
- Find out why integrationTest crashes on Windows in Release build. Probably a memory leak?
- implementing support for big file upload/download (chunked upload/download
- Improve integration-test coverage
- Improve unit-test coverage
- Improve unit-test coverage
12 changes: 2 additions & 10 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ project(CloudSync)
# dependencies
find_package(nlohmann_json REQUIRED)
find_package(pugixml REQUIRED)
find_package(CURL)
find_package(libcurl)
find_package(CURL REQUIRED)

set(INCLUDE
include/CloudSync/CloudFactory.hpp
Expand Down Expand Up @@ -152,16 +151,9 @@ target_link_libraries(CloudSync
PUBLIC
nlohmann_json::nlohmann_json
pugixml::pugixml
CURL::CURL
)

if(CURL_FOUND)
target_link_libraries(CloudSync PUBLIC CURL::CURL)
elseif(libcurl_FOUND)
target_link_libraries(CloudSync PUBLIC libcurl::curl)
else()
message(SEND_ERROR "libcurl dependency not found")
endif()

set_target_properties (CloudSync PROPERTIES
FOLDER CloudSync
)
Expand Down

0 comments on commit c12562e

Please sign in to comment.