Merge cf5a317715
into 445e9bd8d0
This commit is contained in:
commit
65e9163d1c
@ -6,5 +6,5 @@ Description: GoogleMock (without main() function)
|
|||||||
Version: @PROJECT_VERSION@
|
Version: @PROJECT_VERSION@
|
||||||
URL: https://github.com/google/googletest
|
URL: https://github.com/google/googletest
|
||||||
Requires: gtest = @PROJECT_VERSION@
|
Requires: gtest = @PROJECT_VERSION@
|
||||||
Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@
|
Libs: -L${libdir} -lgmock@DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@
|
||||||
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@
|
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@
|
||||||
|
@ -5,5 +5,5 @@ Name: gtest
|
|||||||
Description: GoogleTest (without main() function)
|
Description: GoogleTest (without main() function)
|
||||||
Version: @PROJECT_VERSION@
|
Version: @PROJECT_VERSION@
|
||||||
URL: https://github.com/google/googletest
|
URL: https://github.com/google/googletest
|
||||||
Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@
|
Libs: -L${libdir} -lgtest@DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@
|
||||||
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@
|
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@
|
||||||
|
@ -324,6 +324,9 @@ function(install_project)
|
|||||||
# Configure and install pkgconfig files.
|
# Configure and install pkgconfig files.
|
||||||
foreach(t ${ARGN})
|
foreach(t ${ARGN})
|
||||||
set(configured_pc "${generated_dir}/${t}.pc")
|
set(configured_pc "${generated_dir}/${t}.pc")
|
||||||
|
if(CMAKE_BUILD_TYPE MATCHES Debug)
|
||||||
|
set(DEBUG_POSTFIX "d")
|
||||||
|
endif()
|
||||||
configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
|
configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in"
|
||||||
"${configured_pc}" @ONLY)
|
"${configured_pc}" @ONLY)
|
||||||
install(FILES "${configured_pc}"
|
install(FILES "${configured_pc}"
|
||||||
|
Loading…
Reference in New Issue
Block a user