Skip to content

Bug: fix windows curl #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 30, 2019
Merged

Bug: fix windows curl #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
745a07b
fix: Correct Windows build
ciband Sep 10, 2019
0a38472
fix: Add include paths to support Mac source build of curl
ciband Sep 12, 2019
6403e80
fix: Correct path to unit test exe
ciband Sep 12, 2019
278ee69
fix: Add missing openssl dependency
ciband Sep 12, 2019
4414db5
fix: Reorder Apple openssl defines
ciband Sep 12, 2019
717098f
chore: remove old CI files
sleepdefic1t Sep 26, 2019
48b5b76
Merge branch 'develop' into bug/fix_windows_curl
sleepdefic1t Sep 26, 2019
ed1173c
Merge branch 'develop' into bug/fix_windows_curl
faustbrian Sep 26, 2019
1100c6d
Merge branch 'develop' into bug/fix_windows_curl
ciband Sep 29, 2019
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
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ build:
project: $(APPVEYOR_BUILD_FOLDER)\Ark-Cpp-Client.sln

test_script:
- cmd: '%APPVEYOR_BUILD_FOLDER%\Bin\%CONFIGURATION%\Ark-Cpp-Client-tests.exe'
- cmd: '%APPVEYOR_BUILD_FOLDER%\test\%CONFIGURATION%\Ark-Cpp-Client-tests.exe'
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ set(CMAKE_CXX_STANDARD 11)

set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR})

set(BUILD_SHARED_LIBS OFF)

if (MSVC)
add_definitions(
-D_CRT_SECURE_NO_WARNINGS
Expand Down
17 changes: 13 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,23 @@ include_directories(${PROJECT_SOURCE_DIR})
set(BUILD_TESTING OFF)
set(HTTP_ONLY ON)
set(CMAKE_USE_LIBSSH2 OFF)
set(CURL_STATICLIB true)
set(CURL_STATIC_CRT ON)
set(BUILD_CURL_EXE false)

if (APPLE)
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl/lib")
set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
endif()

add_subdirectory(${PROJECT_SOURCE_DIR}/lib/curl)

include_directories(${PROJECT_SOURCE_DIR}/lib/curl/include)

if (UNIX AND NOT APPLE)
add_subdirectory(${PROJECT_SOURCE_DIR}/lib/curl)
target_link_libraries(${PROJECT_NAME} PUBLIC libcurl)
if (APPLE)
target_link_libraries(${PROJECT_NAME} PUBLIC CURL)
else()
target_link_libraries(${PROJECT_NAME} PUBLIC CURL)
target_link_libraries(${PROJECT_NAME} PUBLIC libcurl)
endif()

# ------------------------------------------------------------------------------
Expand Down