Changeset: 7f930625d798 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f930625d798 Branch: octbugs Log Message:
merged diffs (39 lines): diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake --- a/cmake/monetdb-defines.cmake +++ b/cmake/monetdb-defines.cmake @@ -116,7 +116,7 @@ function(monetdb_configure_defines) # Some libc versions on Linux distributions don't have it check_symbol_exists("semtimedop" "sys/types.h;sys/ipc.h;sys/sem.h" HAVE_SEMTIMEDOP) cmake_push_check_state() - set(CMAKE_REQUIRED_LINK_OPTIONS "-lpthread") + set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") check_function_exists("pthread_kill" HAVE_PTHREAD_KILL) check_function_exists("pthread_sigmask" HAVE_PTHREAD_SIGMASK) cmake_pop_check_state() diff --git a/ctest/tools/CMakeLists.txt b/ctest/tools/CMakeLists.txt --- a/ctest/tools/CMakeLists.txt +++ b/ctest/tools/CMakeLists.txt @@ -6,5 +6,4 @@ # Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. #]] -#add_subdirectory(embedded) add_subdirectory(monetdbe) 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 @@ -55,12 +55,14 @@ target_link_libraries(example_append_raw monetdbe) add_test(run_example_append_raw example_append_raw) +if(NOT WIN32) add_executable(example_backup example_backup.c) target_link_libraries(example_backup PRIVATE monetdb_config_header monetdbe) add_test(run_example_backup example_backup) +endif() add_executable(example_connections example_connections.c) target_link_libraries(example_connections _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list