Skip to content

Commit dd332e2

Browse files
committed
cmake: use absolute path to deps
When refering to files and directories inside of the top-level "deps/" directory, we're being inconsistent in using relative or absolute paths. To enable splitting out parts of the top-level CMakeLists.txt into an own file in the "src/" directory, consistently switch over to use absolute paths to avoid errors when converting.
1 parent 8341d6c commit dd332e2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,13 @@ IF (WIN32 AND WINHTTP)
252252
MESSAGE(FATAL_ERROR "Could not find dlltool command")
253253
ENDIF ()
254254

255-
SET(LIBWINHTTP_PATH "${CMAKE_CURRENT_BINARY_DIR}/deps/winhttp")
255+
SET(LIBWINHTTP_PATH "${CMAKE_BINARY_DIR}/deps/winhttp")
256256
FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
257257

258258
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
259-
set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp64.def")
259+
set(WINHTTP_DEF "${CMAKE_SOURCE_DIR}/deps/winhttp/winhttp64.def")
260260
ELSE()
261-
set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp.def")
261+
set(WINHTTP_DEF "${CMAKE_SOURCE_DIR}/deps/winhttp/winhttp.def")
262262
ENDIF()
263263

264264
ADD_CUSTOM_COMMAND(
@@ -273,7 +273,7 @@ IF (WIN32 AND WINHTTP)
273273
PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a
274274
)
275275

276-
INCLUDE_DIRECTORIES(deps/winhttp)
276+
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/winhttp")
277277
LINK_DIRECTORIES(${LIBWINHTTP_PATH})
278278
ENDIF ()
279279

@@ -327,8 +327,8 @@ ENDIF()
327327

328328
# Include POSIX regex when it is required
329329
IF(WIN32 OR AMIGA OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
330-
INCLUDE_DIRECTORIES(deps/regex)
331-
SET(SRC_REGEX deps/regex/regex.c)
330+
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/regex")
331+
SET(SRC_REGEX "${CMAKE_SOURCE_DIR}/deps/regex/regex.c")
332332
ENDIF()
333333

334334
# Optional external dependency: http-parser
@@ -339,8 +339,8 @@ IF (USE_EXT_HTTP_PARSER AND HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUA
339339
LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
340340
ELSE()
341341
MESSAGE(STATUS "http-parser version 2 was not found or disabled; using bundled 3rd-party sources.")
342-
INCLUDE_DIRECTORIES(deps/http-parser)
343-
FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h)
342+
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/http-parser")
343+
FILE(GLOB SRC_HTTP "${CMAKE_SOURCE_DIR}/deps/http-parser/*.c" "${CMAKE_SOURCE_DIR}/deps/http-parser/*.h")
344344
ENDIF()
345345

346346
# Optional external dependency: zlib
@@ -355,9 +355,9 @@ IF (ZLIB_FOUND)
355355
ENDIF()
356356
ELSE()
357357
MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." )
358-
INCLUDE_DIRECTORIES(deps/zlib)
358+
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/deps/zlib")
359359
ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
360-
FILE(GLOB SRC_ZLIB deps/zlib/*.c deps/zlib/*.h)
360+
FILE(GLOB SRC_ZLIB "${CMAKE_SOURCE_DIR}/deps/zlib/*.c" "${CMAKE_SOURCE_DIR}/deps/zlib/*.h")
361361
ENDIF()
362362

363363
# Optional external dependency: libssh2

0 commit comments

Comments
 (0)