Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions patch/Libs/RemoteIO/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ vtk_module_add_module(Slicer::RemoteIO
HEADERS ${wrapper_header_file}
)

vtk_module_link(Slicer::RemoteIO PUBLIC vtkAddon PRIVATE ${CURL_LIBRARIES} ZLIB::ZLIB)
vtk_module_include(Slicer::RemoteIO PRIVATE ${CURL_INCLUDE_DIRS})
vtk_module_link(Slicer::RemoteIO PUBLIC vtkAddon PRIVATE CURL::libcurl_static ZLIB::ZLIB)

if(WIN32)
# Define CURL_STATICLIB when linking against static curl on Windows
Expand Down
17 changes: 2 additions & 15 deletions patch/SuperBuild/External_curl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,28 +109,15 @@ if((NOT DEFINED CURL_INCLUDE_DIR

ExternalProject_GenerateProjectDescription_Step(${proj})

if(UNIX)
set(curl_IMPORT_SUFFIX .a)
if(APPLE)
set(curl_IMPORT_SUFFIX .a)
endif()
elseif(WIN32)
set(curl_IMPORT_SUFFIX .lib)
else()
message(FATAL_ERROR "Unknown system !")
endif()

set(CURL_INCLUDE_DIR "${EP_INSTALL_DIR}/include")
set(CURL_LIBRARY "${EP_INSTALL_DIR}/lib/libcurl${curl_IMPORT_SUFFIX}")
set(CURL_DIR "${EP_INSTALL_DIR}/lib/cmake/CURL")

else()
ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
endif()

mark_as_superbuild(
VARS
CURL_INCLUDE_DIR:PATH
CURL_LIBRARY:FILEPATH
CURL_DIR:PATH
LABELS "FIND_PACKAGE"
)

Expand Down
Loading