Changeset: d862ff933487 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d862ff933487
Modified Files:
cmake/monetdb-functions.cmake
ctest/tools/monetdbe/CMakeLists.txt
Branch: Jul2021
Log Message:
Backed out changeset 133485ba9b67 The CMOCKA_FOUND variable is not set
diffs (23 lines):
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -180,7 +180,6 @@ function(monetdb_cmake_summary)
message(STATUS "Reprepro: ${REPREPRO_FOUND}")
message(STATUS "Semodule: ${SEMODULE_FOUND}")
message(STATUS "Awk: ${AWK_FOUND}")
- message(STATUS "Cmocka: ${CMOCKA_FOUND}")
message(STATUS "flags: ${CMAKE_C_FLAGS}")
message(STATUS "-----------------------------------------")
message(STATUS "")
diff --git a/ctest/tools/monetdbe/CMakeLists.txt
b/ctest/tools/monetdbe/CMakeLists.txt
--- a/ctest/tools/monetdbe/CMakeLists.txt
+++ b/ctest/tools/monetdbe/CMakeLists.txt
@@ -86,7 +86,7 @@ target_link_libraries(example_proxy
monetdb_config_header
monetdbe)
-if(WITH_CMOCKA AND CMOCKA_FOUND)
+if(WITH_CMOCKA)
add_executable(cmocka_test cmocka_test.c test_helper.c)
target_include_directories(cmocka_test PRIVATE "${CMOCKA_INCLUDE_DIR}")
target_link_libraries(cmocka_test
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
