8000 cmake: fix up source and binary directory paths · libgit2/libgit2@72f27cb · GitHub
[go: up one dir, main page]
Skip to content

Commit 72f27cb

Browse files
pks-tpks-t
committed
cmake: fix up source and binary directory paths
There are quite some uses of the variables "${CMAKE_CURRENT_SOURCE_DIR}" and "${CMAKE_CURRENT_BINARY_DIR}" where they are not appropriate. Convert these sites to instead use the variables "${CMAKE_SOURCE_DIR}" and "${CMAKE_BINARY_DIR}", which instead point to the project's root directory. This will ease splitting up the library build instructions into its own subdirectory.
1 parent 1f43a43 commit 72f27cb

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

‎CMakeLists.txt‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IF (CMAKE_VERSION VERSION_GREATER 3.0)
1919
ENDIF()
2020

2121
# Add find modules to the path
22-
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
22+
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
2323

2424
INCLUDE(CheckLibraryExists)
2525
INCLUDE(CheckFunctionExists)
@@ -161,7 +161,7 @@ FUNCTION(IDE_SPLIT_SOURCES target)
161161
GET_TARGET_PROPERTY(sources ${target} SOURCES)
162162
FOREACH(source ${sources 6880 })
163163
IF(source MATCHES ".*/")
164-
STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" rel ${source})
164+
STRING(REPLACE ${CMAKE_SOURCE_DIR}/ "" rel ${source})
165165
IF(rel)
166166
STRING(REGEX REPLACE "/([^/]*)$" "" rel ${rel})
167167
IF(rel)
@@ -174,14 +174,14 @@ FUNCTION(IDE_SPLIT_SOURCES target)
174174
ENDIF()
175175
ENDFUNCTION()
176176

177-
FILE(STRINGS "include/git2/version.h" GIT2_HEADER REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$")
177+
FILE(STRINGS "${CMAKE_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$")
178178

179179
STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"([0-9]+).*$" "\\1" LIBGIT2_VERSION_MAJOR "${GIT2_HEADER}")
180180
STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_MINOR "${GIT2_HEADER}")
181181
STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_REV "${GIT2_HEADER}")
182182
SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}")
183183

10BC0 184-
FILE(STRINGS "include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION [0-9]+$")
184+
FILE(STRINGS "${CMAKE_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION [0-9]+$")
185185
STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}")
186186

187187
# Enable tracing
@@ -567,7 +567,10 @@ ENDIF()
567567
ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
568568

569569
# Collect sourcefiles
570-
FILE(GLOB SRC_H include/git2.h include/git2/*.h include/git2/sys/*.h)
570+
FILE(GLOB SRC_H
571+
"${CMAKE_SOURCE_DIR}/include/git2.h"
572+
"${CMAKE_SOURCE_DIR}/include/git2/*.h"
573+
"${CMAKE_SOURCE_DIR}/include/git2/sys/*.h")
571574

572575
# On Windows use specific platform sources
573576
IF (WIN32 AND NOT CYGWIN)
@@ -645,7 +648,7 @@ IF (SONAME)
645648
ENDIF()
646649
ENDIF()
647650
STRING(REPLACE ";" " " LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS}")
648-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libgit2.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc @ONLY)
651+
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libgit2.pc.in ${CMAKE_BINARY_DIR}/libgit2.pc @ONLY)
649652

650653
IF (MSVC_IDE)
651654
# Precompiled headers
@@ -659,9 +662,9 @@ INSTALL(TARGETS git2
659662
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
660663
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
661664
)
662-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
663-
INSTALL(DIRECTORY include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} )
664-
INSTALL(FILES include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} )
665+
INSTALL(FILES ${CMAKE_BINARY_DIR}/libgit2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
666+
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} )
667+
INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} )
665668

666669
# Tests
667670
IF (BUILD_CLAR)

0 commit comments

Comments
 (0)
0