From b623f5953691b2a0614e6f1f4def86bdbb9a4113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Aug 2020 11:53:00 +0200 Subject: New upstream version 5.2.0Beta2.1 --- CMake/FindCMocka.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'CMake/FindCMocka.cmake') diff --git a/CMake/FindCMocka.cmake b/CMake/FindCMocka.cmake index bec2905..6a5484e 100644 --- a/CMake/FindCMocka.cmake +++ b/CMake/FindCMocka.cmake @@ -23,24 +23,23 @@ set (CMOCKA_ROOT_DIR - "C:/Users/Martin/Documents/CMocka") + "../../external/x86/cmocka") find_path(CMOCKA_INCLUDE_DIR NAMES cmocka.h PATHS ${CMOCKA_ROOT_DIR}/include - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Andreas Schneider\\cmocka]/include" ) find_library(CMOCKA_LIBRARY NAMES - cmocka + cmocka-static PATHS ${CMOCKA_ROOT_DIR}/lib - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Andreas Schneider\\cmocka]/lib" ) + if (CMOCKA_LIBRARY) set(CMOCKA_LIBRARIES ${CMOCKA_LIBRARIES} @@ -52,4 +51,4 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARY CMOCKA_INCLUDE_DIR) # show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view -mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARY CMOCKA_LIBRARIES) \ No newline at end of file +mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARY CMOCKA_LIBRARIES) -- cgit v1.2.3