Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 84ff45dd authored by Thomas Eschenbacher's avatar Thomas Eschenbacher

make system: use cmake builtin commands for 'rm' and 'mkdir'

parent c35c01d6
......@@ -426,10 +426,9 @@ CONFIGURE_FILE(
#############################################################################
### "make apidoc" ###
FIND_PROGRAM(RM_EXECUTABLE rm)
FIND_PROGRAM(DOXYGEN_EXECUTABLE doxygen)
IF (DOXYGEN_EXECUTABLE AND RM_EXECUTABLE)
IF (DOXYGEN_EXECUTABLE)
SET(DOXYFILE ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
SET(DOXYGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/doc/api)
SET(DOXYGEN_LOGFILE ${CMAKE_CURRENT_BINARY_DIR}/doxygen.log)
......@@ -444,8 +443,8 @@ IF (DOXYGEN_EXECUTABLE AND RM_EXECUTABLE)
ADD_CUSTOM_TARGET(apidoc
DEPENDS html_doc_devel
COMMAND "${RM_EXECUTABLE}" -R -f "${CMAKE_BINARY_DIR}/doc/api"
COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_BINARY_DIR}/doc/api"
COMMAND "${CMAKE_COMMAND}" -E remove_directory "${CMAKE_BINARY_DIR}/doc/api"
COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_BINARY_DIR}/doc/api"
COMMAND "${DOXYGEN_EXECUTABLE}" "${DOXYFILE}"
COMMAND "${CAT_EXECUTABLE}" "${DOXYGEN_LOGFILE}"
DEPENDS ${DOXYFILE}
......@@ -457,7 +456,7 @@ IF (DOXYGEN_EXECUTABLE AND RM_EXECUTABLE)
${DOXYGEN_LOGFILE}
)
ENDIF (DOXYGEN_EXECUTABLE AND RM_EXECUTABLE)
ENDIF (DOXYGEN_EXECUTABLE)
#############################################################################
### additional files for "make clean" ###
......
......@@ -27,7 +27,6 @@ FIND_REQUIRED_PROGRAM(MSGCAT_EXECUTABLE msgcat)
FIND_REQUIRED_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
FIND_REQUIRED_PROGRAM(MSGMERGE_EXECUTABLE msgmerge)
FIND_REQUIRED_PROGRAM(MSGFMT_EXECUTABLE msgfmt)
FIND_REQUIRED_PROGRAM(RM_EXECUTABLE rm)
SET(PO_SRC_DIR "${CMAKE_SOURCE_DIR}/po")
SET(PO_BIN_DIR "${CMAKE_BINARY_DIR}/po")
......
......@@ -25,8 +25,6 @@
#############################################################################
### some needed programs ###
FIND_PROGRAM(MKDIR_EXECUTABLE NAMES mkdir)
FIND_PROGRAM(RM_EXECUTABLE NAMES rm)
FIND_PROGRAM(TAR_EXECUTABLE NAMES tar) # we need tar-1.16 or newer !
FIND_PROGRAM(RPM_EXECUTABLE NAMES rpm)
FIND_PROGRAM(RPMBUILD_EXECUTABLE NAMES rpmbuild)
......@@ -117,7 +115,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${_tarball_bz2}
-C ${DISTFILES_DIR}
--transform=s+^+kwave-${KWAVE_VERSION}/+g
kwave.spec
COMMAND ${RM_EXECUTABLE} -f ${_tarball_bz2}
COMMAND ${CMAKE_COMMAND} -E remove -f ${_tarball_bz2}
COMMAND ${BZIP2_EXECUTABLE} ${_tarball}
DEPENDS ${_specfile} ${files_lst}
)
......@@ -140,7 +138,7 @@ EXECUTE_PROCESS(
SET(_src_rpm ${_rpm_topdir}/SRPMS/kwave-${RPM_FULL_VERSION}.src.rpm)
ADD_CUSTOM_COMMAND(OUTPUT ${_src_rpm}
COMMAND ${MKDIR_EXECUTABLE} -p ${_rpm_topdir}/{SPECS,SOURCES,RPMS,SRPMS,BUILD}
COMMAND ${CMAKE_COMMAND} -E make_directory ${_rpm_topdir}/{SPECS,SOURCES,RPMS,SRPMS,BUILD}
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${_specfile} ${_rpm_topdir}/SPECS/kwave-${RPM_FULL_VERSION}.spec
COMMAND ${CMAKE_COMMAND} -E copy_if_different
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment