cmake: Fix usage of cmocka with build tree

Reviewed-by: Andreas Schneider <[email protected]>

Author: Arnaud Gelas

CMakeLists.txt

@@ -82,14 +82,19 @@ 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
                               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
                               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

cmocka-build-tree-settings.cmake.in

@@ -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@)

cmocka-config.cmake.in

@@ -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@)
-endif()
+    set_and_check(CMOCKA_INCLUDE_DIR @PACKAGE_INCLUDE_INSTALL_DIR@)
 
-set(CMOCKA_LIBRARY @PACKAGE_LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
-set(CMOCKA_LIBRARIES @PACKAGE_LIB_INSTALL_DIR@/@CMOCKA_LIBRARY_NAME@)
+    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()
 
 mark_as_advanced(CMOCKA_LIBRARY CMOCKA_INCLUDE_DIR)