Changeset: 4a4945c3e000 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a4945c3e000 Added Files: cmake/Modules/FindDpkgBuildpackage.cmake cmake/Modules/FindReprepro.cmake cmake/Modules/FindRpmbuild.cmake cmake/Modules/FindSemodule.cmake Modified Files: cmake/monetdb-custom-targets.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-functions.cmake Branch: default Log Message:
detect more executables diffs (188 lines): diff --git a/cmake/Modules/FindDpkgBuildpackage.cmake b/cmake/Modules/FindDpkgBuildpackage.cmake new file mode 100644 --- /dev/null +++ b/cmake/Modules/FindDpkgBuildpackage.cmake @@ -0,0 +1,20 @@ +#[[ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. +#]] + +find_program(DPKGBUILDPACKAGE_EXECUTABLE NAMES dpkg-buildpackage + DOC "Create deb packages" +) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(DpkgBuildpackage + DEFAULT_MSG + DPKGBUILDPACKAGE_EXECUTABLE +) + +mark_as_advanced(DPKGBUILDPACKAGE_EXECUTABLE) diff --git a/cmake/Modules/FindReprepro.cmake b/cmake/Modules/FindReprepro.cmake new file mode 100644 --- /dev/null +++ b/cmake/Modules/FindReprepro.cmake @@ -0,0 +1,20 @@ +#[[ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. +#]] + +find_program(REPREPRO_EXECUTABLE NAMES reprepro + DOC "Create debian package repository" +) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(Reprepro + DEFAULT_MSG + REPREPRO_EXECUTABLE +) + +mark_as_advanced(REPREPRO_EXECUTABLE) diff --git a/cmake/Modules/FindRpmbuild.cmake b/cmake/Modules/FindRpmbuild.cmake new file mode 100644 --- /dev/null +++ b/cmake/Modules/FindRpmbuild.cmake @@ -0,0 +1,20 @@ +#[[ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. +#]] + +find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild + DOC "Create rpm packages" +) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(Rpmbuild + DEFAULT_MSG + RPMBUILD_EXECUTABLE +) + +mark_as_advanced(RPMBUILD_EXECUTABLE) diff --git a/cmake/Modules/FindSemodule.cmake b/cmake/Modules/FindSemodule.cmake new file mode 100644 --- /dev/null +++ b/cmake/Modules/FindSemodule.cmake @@ -0,0 +1,20 @@ +#[[ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. +#]] + +find_program(SEMODULE_EXECUTABLE NAMES semodule + DOC "Manage selinux policy mocules" +) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(Semodule + DEFAULT_MSG + SEMODULE_EXECUTABLE +) + +mark_as_advanced(SEMODULE_EXECUTABLE) diff --git a/cmake/monetdb-custom-targets.cmake b/cmake/monetdb-custom-targets.cmake --- a/cmake/monetdb-custom-targets.cmake +++ b/cmake/monetdb-custom-targets.cmake @@ -30,15 +30,25 @@ else() ${CMAKE_COMMAND} -E echo 'Target not available because \"createrepo\" was not found.') endif() -add_custom_target(create-rpm-packages - COMMAND - ${CMAKE_CPACK_COMMAND} -G RPM - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +if(RPMBUILD_FOUND) + add_custom_target(create-rpm-packages + COMMAND + ${CMAKE_CPACK_COMMAND} -G RPM + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -add_custom_target(create-source-rpm-packages - COMMAND - ${CMAKE_CPACK_COMMAND} --config CPackSourceConfig.cmake -G RPM - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) + add_custom_target(create-source-rpm-packages + COMMAND + ${CMAKE_CPACK_COMMAND} --config CPackSourceConfig.cmake -G RPM + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +else() + add_custom_target(create-rpm-packages + COMMAND + ${CMAKE_COMMAND} -E echo 'Target not available because \"rpmbuild\" was not found.') + + add_custom_target(create-source-rpm-packages + COMMAND + ${CMAKE_COMMAND} -E echo 'Target not available because \"rpmbuild\" was not found.') +endif() add_custom_target(create-rpm-distro COMMAND @@ -52,3 +62,23 @@ add_custom_target(create-rpm-distro COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/repodata" "${CMAKE_BINARY_DIR}/distro/repodata/" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) + +if(DPKGBUILDPACKAGE_FOUND) + add_custom_target(create-deb-packages + COMMAND + ${CMAKE_CPACK_COMMAND} -G DEB + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) + + add_custom_target(create-source-deb-packages + COMMAND + ${CMAKE_CPACK_COMMAND} --config CPackSourceConfig.cmake -G DEB + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +else() + add_custom_target(create-deb-packages + COMMAND + ${CMAKE_COMMAND} -E echo 'Target not available because \"dpkg-buildpackage\" was not found.') + + add_custom_target(create-source-deb-packages + COMMAND + ${CMAKE_COMMAND} -E echo 'Target not available because \"dpkg-buildpackage\" was not found.') +endif() diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake --- a/cmake/monetdb-findpackages.cmake +++ b/cmake/monetdb-findpackages.cmake @@ -110,5 +110,9 @@ endif() find_package(Sphinx) find_package(Createrepo) +find_package(Rpmbuild) +find_package(DpkgBuildpackage) +find_package(Reprepro) +find_package(Semodule) # vim: set ts=2:sw=2:et diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake --- a/cmake/monetdb-functions.cmake +++ b/cmake/monetdb-functions.cmake @@ -146,6 +146,10 @@ function(monetdb_cmake_summary) message(STATUS "ODBC: ${ODBC_FOUND}") message(STATUS "Sphinx: ${SPHINX_FOUND}") message(STATUS "Createrepo: ${CREATEREPO_FOUND}") + message(STATUS "Rpmbuild: ${RPMBUILD_FOUND}") + message(STATUS "Dpkg-buildpackage: ${DPKGBUILDPACKAGE_FOUND}") + message(STATUS "Reprepro: ${REPREPRO_FOUND}") + message(STATUS "Semodule: ${SEMODULE_FOUND}") message(STATUS "-----------------------------------------") message(STATUS "") endfunction() _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
