cmake: Fix usage of cmocka with build tree
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
parent
8e60ec80b6
commit
1a41f98a6b
|
@ -82,6 +82,11 @@ else()
|
|||
set(CMOCKA_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
endif()
|
||||
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmocka-build-tree-settings.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/cmocka-build-tree-settings.cmake
|
||||
@ONLY
|
||||
)
|
||||
|
||||
set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE INTERNAL "")
|
||||
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE INTERNAL "")
|
||||
configure_package_config_file(${PROJECT_NAME}-config.cmake.in
|
||||
|
@ -89,7 +94,7 @@ configure_package_config_file(${PROJECT_NAME}-config.cmake.in
|
|||
PATH_VARS
|
||||
INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
|
||||
INSTALL_DESTINATION
|
||||
${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
||||
${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME})
|
||||
|
||||
write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake
|
||||
COMPATIBILITY
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
set(CMOCKA_INLUDE_DIR @PROJECT_SOURCE_DIR@/include)
|
||||
set_and_check(CMOCKA_INLUDE_DIR @PROJECT_SOURCE_DIR@/include)
|
||||
set_and_check(CMOCKA_LIBRARY @PROJECT_BINARY_DIR@/src/@CMOCKA_LIBRARY_NAME@)
|
||||
set_and_check(CMOCKA_LIBRARIES @PROJECT_BINARY_DIR@/src/@CMOCKA_LIBRARY_NAME@)
|
||||
|
|
|
@ -6,10 +6,10 @@ if (EXISTS "${CMOCKA_CMAKE_DIR}/CMakeCache.txt")
|
|||
# In build tree
|
||||
include(${CMOCKA_CMAKE_DIR}/cmocka-build-tree-settings.cmake)
|
||||
else()
|
||||
set(CMOCKA_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIR@)
|
||||
set_and_check(CMOCKA_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIR@)
|
||||
|
||||
set_and_check(CMOCKA_LIBRARY @PACKAGE_LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
|
||||
set_and_check(CMOCKA_LIBRARIES @PACKAGE_LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
|
||||
endif()
|
||||
|
||||
set(CMOCKA_LIBRARY @PACKAGE_LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
|
||||
set(CMOCKA_LIBRARIES @PACKAGE_LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
|
||||
|
||||
mark_as_advanced(CMOCKA_LIBRARY CMOCKA_INCLUDE_DIR)
|
||||
|
|
Loading…
Reference in New Issue