cmake: Do not use uninitialized variables
These variables were used without initialization, which means that the pkg-config files were being put into /pkgconfig, etc. Fixes: https://travis-ci.org/sysrepo/sysrepo/builds/426872891 Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
parent
3a2554be66
commit
b12767a8bb
|
@ -67,7 +67,7 @@ install(
|
||||||
FILES
|
FILES
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc
|
${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc
|
||||||
DESTINATION
|
DESTINATION
|
||||||
${LIB_INSTALL_DIR}/pkgconfig
|
${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||||
COMPONENT
|
COMPONENT
|
||||||
pkgconfig
|
pkgconfig
|
||||||
)
|
)
|
||||||
|
@ -82,7 +82,7 @@ install(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
|
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
|
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
|
||||||
DESTINATION
|
DESTINATION
|
||||||
${CMAKE_INSTALL_DIR}/${PROJECT_NAME}
|
${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
|
||||||
COMPONENT
|
COMPONENT
|
||||||
devel
|
devel
|
||||||
)
|
)
|
||||||
|
|
|
@ -10,7 +10,7 @@ include(TestBigEndian)
|
||||||
set(PACKAGE ${PROJECT_NAME})
|
set(PACKAGE ${PROJECT_NAME})
|
||||||
set(VERSION ${PROJECT_VERSION})
|
set(VERSION ${PROJECT_VERSION})
|
||||||
set(DATADIR ${DATA_INSTALL_DIR})
|
set(DATADIR ${DATA_INSTALL_DIR})
|
||||||
set(LIBDIR ${LIB_INSTALL_DIR})
|
set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
|
||||||
set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
|
set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
|
||||||
set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
|
set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
|
||||||
|
|
||||||
|
|
|
@ -4,10 +4,10 @@ if (EXISTS "${CMOCKA_CMAKE_DIR}/CMakeCache.txt")
|
||||||
# In build tree
|
# In build tree
|
||||||
include(${CMOCKA_CMAKE_DIR}/cmocka-build-tree-settings.cmake)
|
include(${CMOCKA_CMAKE_DIR}/cmocka-build-tree-settings.cmake)
|
||||||
else()
|
else()
|
||||||
set(CMOCKA_INCLUDE_DIR @INCLUDE_INSTALL_DIR@)
|
set(CMOCKA_INCLUDE_DIR @CMAKE_INSTALL_FULL_INCLUDEDIR@)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CMOCKA_LIBRARY @LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
|
set(CMOCKA_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@CMOCKA_LIBRARY_NAME@)
|
||||||
set(CMOCKA_LIBRARIES @LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
|
set(CMOCKA_LIBRARIES @CMAKE_INSTALL_FULL_LIBDIR@/@CMOCKA_LIBRARY_NAME@)
|
||||||
|
|
||||||
mark_as_advanced(CMOCKA_LIBRARY CMOCKA_INCLUDE_DIR)
|
mark_as_advanced(CMOCKA_LIBRARY CMOCKA_INCLUDE_DIR)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Name: ${PROJECT_NAME}
|
Name: ${PROJECT_NAME}
|
||||||
Description: The cmocka unit testing library
|
Description: The cmocka unit testing library
|
||||||
Version: ${PROJECT_VERSION}
|
Version: ${PROJECT_VERSION}
|
||||||
Libs: -L${LIB_INSTALL_DIR} -lcmocka
|
Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lcmocka
|
||||||
Cflags: -I${INCLUDE_INSTALL_DIR}
|
Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
|
||||||
|
|
Loading…
Reference in New Issue