Fix cstest build with Ninja (capstone-engine#2506)

Rot127 · Oct 16, 2024 · 7db9a08 · 7db9a08
1 parent 7624269
commit 7db9a08
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/suite/cstest/CMakeLists.txt b/suite/cstest/CMakeLists.txt
@@ -4,13 +4,15 @@ include(ExternalProject)
 find_library(libyaml
     NAMES libyaml yaml
     REQUIRED)
+set(CMOCKA_LIB_FILE "${CMAKE_CURRENT_BINARY_DIR}/extern/src/cmocka_ext-build/src/libcmocka.a")
 ExternalProject_Add(cmocka_ext
     PREFIX extern
     URL "https://cmocka.org/files/1.1/cmocka-1.1.7.tar.xz"
     URL_HASH SHA256=810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82
     DOWNLOAD_EXTRACT_TIMESTAMP true
     CONFIGURE_COMMAND cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../cmocka_ext/
     BUILD_COMMAND cmake --build . --config Release
+    BUILD_BYPRODUCTS "${CMOCKA_LIB_FILE}"
     INSTALL_COMMAND ""
 )
 
@@ -20,24 +22,24 @@ else()
     set(LIBCYAML_VARIANT "release")
 endif()
 
+set(LIBCYAML_LIB_FILE "${CMAKE_CURRENT_BINARY_DIR}/extern/src/libcyaml_ext/build/${LIBCYAML_VARIANT}/libcyaml.a")
 ExternalProject_Add(libcyaml_ext
     PREFIX extern
     URL "https://github.com/tlsa/libcyaml/archive/refs/tags/v1.4.1.tar.gz"
     URL_HASH SHA256=8dbd216e1fce90f9f7cca341e5178710adc76ee360a7793ef867edb28f3e4130
     DOWNLOAD_EXTRACT_TIMESTAMP true
     CONFIGURE_COMMAND ""
     BUILD_COMMAND make VARIANT=${LIBCYAML_VARIANT} PKG_CONFIG=pkg-config
+    BUILD_BYPRODUCTS "${LIBCYAML_LIB_FILE}"
     BUILD_IN_SOURCE true
     INSTALL_COMMAND ""
 )
 set(CMOCKA_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/extern/src/cmocka_ext/include)
-set(CMOCKA_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/extern/src/cmocka_ext-build/src/)
 set(LIBCYAML_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/extern/src/libcyaml_ext/include)
-set(LIBCYAML_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/extern/src/libcyaml_ext/build/${LIBCYAML_VARIANT}/)
 add_library(cmocka STATIC IMPORTED)
 add_library(libcyaml STATIC IMPORTED)
-set_target_properties(cmocka PROPERTIES IMPORTED_LOCATION ${CMOCKA_LIB_DIR}/libcmocka.a)
-set_target_properties(libcyaml PROPERTIES IMPORTED_LOCATION ${LIBCYAML_LIB_DIR}/libcyaml.a)
+set_target_properties(cmocka PROPERTIES IMPORTED_LOCATION "${CMOCKA_LIB_FILE}")
+set_target_properties(libcyaml PROPERTIES IMPORTED_LOCATION "${LIBCYAML_LIB_FILE}")
 
 set(CSTEST_INCLUDE_DIR ${CSTEST_DIR}/include)
 file(GLOB CSTEST_SRC ${CSTEST_DIR}/src/*.c)