rpms/mariadb-connector-c
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to the CMake out-of-source building

Browse Source
This commit is contained in:
Michal Schorm 2023-04-18 19:52:34 +02:00
parent eac68a7a71
commit 450c364474
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mariadb-connector-c.spec
View File

@ -3,14 +3,6 @@
# Enable building and packing of the testsuite # Enable building and packing of the testsuite
%bcond_without testsuite %bcond_without testsuite
# Enable CMake in-source builds
# This is is a workaround for the https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
# which reverts the CMake behaviour to before F33
# The Change owners offered themselves to help fix the affected packages via ProvenPackager rights.
# I'm generally in favor of this change, however when I tried to adapt it, I encountered a number of issues.
# That's why I disabled it for now.
%global __cmake_in_source_build 1
Name: mariadb-connector-c Name: mariadb-connector-c
@ -176,9 +168,7 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
# - ignore the testsuite result for now. Enable tests now, fix them later. # - ignore the testsuite result for now. Enable tests now, fix them later.
# Note: there must be a database called 'test' created for the testcases to be run # Note: there must be a database called 'test' created for the testcases to be run
%if %{with testsuite} %if %{with testsuite}
pushd unittest/libmariadb/ %ctest --test-dir %{__cmake_builddir}/unittest/libmariadb/ || :
%ctest || :
popd
%endif %endif

4
testsuite.patch
View File

@ -6,5 +6,5 @@
ENDFOREACH() ENDFOREACH()
+ +
+INSTALL(TARGETS ${API_TESTS} DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests) +INSTALL(TARGETS ${API_TESTS} DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)
+INSTALL(FILES ${CC_SOURCE_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests) +INSTALL(FILES ${CC_BINARY_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests)
+INSTALL(FILES ${CC_SOURCE_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests) +INSTALL(FILES ${CC_BINARY_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)