Skip to content
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

Jump to bottom

use .lib instead of .dll for curl #39

Closed
wants to merge 2 commits into from
Closed

use .lib instead of .dll for curl #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c2b44
use .lib instead of .dll for curl
Karsten1987 Apr 7, 2020
3769e6c
append both, lib and bin
Karsten1987 Apr 8, 2020
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 libcurl_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if(NOT CURL_FOUND)
if(WIN32)
ament_environment_hooks(env_hook/libcurl_vendor_library_path.bat)
set(ENV_VAR_NAME "PATH")
set(ENV_VAR_VALUE "opt\\libcurl_vendor\\bin")
set(ENV_VAR_VALUE "opt\\libcurl_vendor\\lib;opt\\libcurl_vendor\\bin")
else()
ament_environment_hooks(env_hook/libcurl_vendor_library_path.sh)
if(APPLE)
Expand Down
2 changes: 1 addition & 1 deletion libcurl_vendor/env_hook/libcurl_vendor_library_path.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:: copied from libcurl_vendor/env_hook/libcurl_vendor_library_path.bat
@echo off

call:ament_prepend_unique_value PATH "%AMENT_CURRENT_PREFIX%\opt\libcurl_vendor\bin"
call:ament_prepend_unique_value PATH "%AMENT_CURRENT_PREFIX%\opt\libcurl_vendor\lib;%AMENT_CURRENT_PREFIX%\opt\libcurl_vendor\bin"

goto:eof

Expand Down