summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-11-19 08:48:08 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2021-11-22 09:27:59 -0500
commit84083dcc8bd41332ccac9d7b537f3e254d79011c (patch)
tree32bb3553065af17c88a549c186f9237748d594bb /deps
parentadcf638cca0a3b38f51a6d7c9b7ce479528cd854 (diff)
downloadlibgit2-84083dcc8bd41332ccac9d7b537f3e254d79011c.tar.gz
cmake: use CMAKE_SOURCE_DIR and CMAKE_BINARY_DIRethomson/cleanup
Instead of using the project-specific `libgit2_SOURCE_DIR` and `libgit2_BINARY_DIR` variables, use `CMAKE_SOURCE_DIR` and `CMAKE_BINARY_DIR`.
Diffstat (limited to 'deps')
-rw-r--r--deps/winhttp/CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/deps/winhttp/CMakeLists.txt b/deps/winhttp/CMakeLists.txt
index 0ad2ac5f0..c11a867a8 100644
--- a/deps/winhttp/CMakeLists.txt
+++ b/deps/winhttp/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT DLLTOOL)
message(FATAL_ERROR "Could not find dlltool command")
endif()
-set(LIBWINHTTP_PATH "${libgit2_BINARY_DIR}/deps/winhttp")
+set(LIBWINHTTP_PATH "${CMAKE_BINARY_DIR}/deps/winhttp")
set(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE)
file(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
@@ -17,10 +17,8 @@ add_custom_command(
OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a
COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a
DEPENDS ${WINHTTP_DEF}
- WORKING_DIRECTORY ${LIBWINHTTP_PATH}
-)
+ WORKING_DIRECTORY ${LIBWINHTTP_PATH})
set_source_files_properties(
${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c
- PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a
-)
+ PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a)