Attachment #624794 for bug #712270

View | Details | Raw Unified | Return to bug 712270
Collapse All | Expand All

Lines 27-34 function(pkg_build_config) Link Here

(-)libgit2-0.99.0.orig/cmake/Modules/PkgBuildConfig.cmake (-5 / +3 lines)
27	# Write .pc "header"	27	# Write .pc "header"
28	file(WRITE "${PKGCONFIG_FILE}"	28	file(WRITE "${PKGCONFIG_FILE}"
29	"prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"	29	"prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"
30	"libdir=\"${LIB_INSTALL_DIR}\"\n"	30	"libdir=\"${CMAKE_INSTALL_FULL_LIBDIR}\"\n"
31	"includedir=\"${INCLUDE_INSTALL_DIR}\"\n"	31	"includedir=\"${CMAKE_INSTALL_FULL_INCLUDEDIR}\"\n"
32	"\n"	32	"\n"
33	"Name: ${PKGCONFIG_NAME}\n"	33	"Name: ${PKGCONFIG_NAME}\n"
34	"Description: ${PKGCONFIG_DESCRIPTION}\n"	34	"Description: ${PKGCONFIG_DESCRIPTION}\n"
Lines 73-79 function(pkg_build_config) Link Here
73	file(APPEND "${PKGCONFIG_FILE}" "Cflags: -I\${includedir} ${PKGCONFIG_CFLAGS}\n")	73	file(APPEND "${PKGCONFIG_FILE}" "Cflags: -I\${includedir} ${PKGCONFIG_CFLAGS}\n")
74		74
75	# Install .pc file	75	# Install .pc file
76	install(FILES "${PKGCONFIG_FILE}"	76	install(FILES "${PKGCONFIG_FILE}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
77	DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
78	)
79	endfunction()	77	endfunction()

Lines 36-41 INCLUDE(AddCFlagIfSupported) Link Here

(-)libgit2-0.99.0.orig/CMakeLists.txt (+1 lines)
36	INCLUDE(FindPkgLibraries)	36	INCLUDE(FindPkgLibraries)
37	INCLUDE(FindThreads)	37	INCLUDE(FindThreads)
38	INCLUDE(FindStatNsec)	38	INCLUDE(FindStatNsec)
		39	INCLUDE(GNUInstallDirs)
39	INCLUDE(IdeSplitSources)	40	INCLUDE(IdeSplitSources)
40	INCLUDE(FeatureSummary)	41	INCLUDE(FeatureSummary)
41	INCLUDE(EnableWarnings)	42	INCLUDE(EnableWarnings)

Lines 248-256 For more advanced use or questions about Link Here

(-)libgit2-0.99.0.orig/README.md (-3 / +3 lines)
248		248
249	The following CMake variables are declared:	249	The following CMake variables are declared:
250		250
251	- `BIN_INSTALL_DIR`: Where to install binaries to.	251	- `CMAKE_INSTALL_BINDIR`: Where to install binaries to.
252	- `LIB_INSTALL_DIR`: Where to install libraries to.	252	- `CMAKE_INSTALL_LIBDIR`: Where to install libraries to.
253	- `INCLUDE_INSTALL_DIR`: Where to install headers to.	253	- `CMAKE_INSTALL_INCLUDEDIR`: Where to install headers to.
254	- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)	254	- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)
255	- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON)	255	- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON)
256	- `THREADSAFE`: Build libgit2 with threading support (defaults to ON)	256	- `THREADSAFE`: Build libgit2 with threading support (defaults to ON)




SET(LIBGIT2_SYSTEM_INCLUDES "")
SET(LIBGIT2_LIBS "")

# Installation paths
#
SET(BIN_INSTALL_DIR bin CACHE PATH "Where to install binaries to.")
SET(LIB_INSTALL_DIR lib CACHE PATH "Where to install libraries to.")
SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.")

# Enable tracing
IF (ENABLE_TRACE STREQUAL "ON")
	SET(GIT_TRACE 1)


# Install
INSTALL(TARGETS git2
	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

Return to bug 712270

Lines 21-32 SET(LIBGIT2_INCLUDES Link Here

(-)libgit2-0.99.0.orig/src/CMakeLists.txt (-11 / +5 lines)
21	SET(LIBGIT2_SYSTEM_INCLUDES "")	21	SET(LIBGIT2_SYSTEM_INCLUDES "")
22	SET(LIBGIT2_LIBS "")	22	SET(LIBGIT2_LIBS "")
23		23
24	# Installation paths
25	#
26	SET(BIN_INSTALL_DIR bin CACHE PATH "Where to install binaries to.")
27	SET(LIB_INSTALL_DIR lib CACHE PATH "Where to install libraries to.")
28	SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.")
29
30	# Enable tracing	24	# Enable tracing
31	IF (ENABLE_TRACE STREQUAL "ON")	25	IF (ENABLE_TRACE STREQUAL "ON")
32	SET(GIT_TRACE 1)	26	SET(GIT_TRACE 1)
Lines 387-395 ENDIF () Link Here
387		381
388	# Install	382	# Install
389	INSTALL(TARGETS git2	383	INSTALL(TARGETS git2
390	RUNTIME DESTINATION ${BIN_INSTALL_DIR}	384	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
391	LIBRARY DESTINATION ${LIB_INSTALL_DIR}	385	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
392	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}	386	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
393	)	387	)
394	INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} )	388	INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
395	INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} )	389	INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})