diff options
| author | Laurent Montel <montel@kde.org> | 2008-10-21 06:46:12 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2008-10-21 06:46:12 +0000 |
| commit | 3ccbe08963ff10657585b2a7ba79825b245c424a (patch) | |
| tree | 4783c1832e1c0a79494c0d7cfa9dce91418f8ba6 | |
| parent | dc691a93575f3ab9151048afec53d3cad907d317 (diff) | |
| download | extra-cmake-modules-3ccbe08963ff10657585b2a7ba79825b245c424a.tar.gz extra-cmake-modules-3ccbe08963ff10657585b2a7ba79825b245c424a.tar.bz2 | |
Bye bye print_status.cmake
svn path=/trunk/KDE/kdelibs/; revision=874282
| -rw-r--r-- | modules/FindPyKDE4.cmake | 4 | ||||
| -rw-r--r-- | modules/PythonMacros.cmake | 4 | ||||
| -rw-r--r-- | modules/SIPMacros.cmake | 3 | ||||
| -rw-r--r-- | modules/print_status.cmake | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/modules/FindPyKDE4.cmake b/modules/FindPyKDE4.cmake index a3654054..fbc34f8b 100644 --- a/modules/FindPyKDE4.cmake +++ b/modules/FindPyKDE4.cmake @@ -127,14 +127,14 @@ MACRO(PYKDE4_INSTALL_PYTHON_FILES) IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. ADD_CUSTOM_COMMAND( TARGET pysupport - COMMAND ${CMAKE_COMMAND} ${_message} -P ${current_module_dir}/print_status.cmake + COMMAND ${CMAKE_COMMAND} -E echo ${message} COMMAND ${PYTHON_EXECUTABLE} ${current_module_dir}/PythonCompile.py ${_bin_py} DEPENDS ${_absfilename} ) ELSE(_abs_bin_py STREQUAL ${_absfilename}) ADD_CUSTOM_COMMAND( TARGET pysupport - COMMAND ${CMAKE_COMMAND} ${_message} -P ${current_module_dir}/print_status.cmake + COMMAND ${CMAKE_COMMAND} -E echo ${message} COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} COMMAND ${PYTHON_EXECUTABLE} ${current_module_dir}/PythonCompile.py ${_bin_py} DEPENDS ${_absfilename} diff --git a/modules/PythonMacros.cmake b/modules/PythonMacros.cmake index c97450d7..fa9b2ba7 100644 --- a/modules/PythonMacros.cmake +++ b/modules/PythonMacros.cmake @@ -39,14 +39,14 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR) IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. ADD_CUSTOM_COMMAND( TARGET compile_python_files - COMMAND ${CMAKE_COMMAND} ${_message} -P ${PYTHON_MACROS_MODULE_PATH}/print_status.cmake + COMMAND ${CMAKE_COMMAND} -E echo ${message} COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} DEPENDS ${_absfilename} ) ELSE(_abs_bin_py STREQUAL ${_absfilename}) ADD_CUSTOM_COMMAND( TARGET compile_python_files - COMMAND ${CMAKE_COMMAND} ${_message} -P ${PYTHON_MACROS_MODULE_PATH}/print_status.cmake + COMMAND ${CMAKE_COMMAND} -E echo ${message} COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} DEPENDS ${_absfilename} diff --git a/modules/SIPMacros.cmake b/modules/SIPMacros.cmake index 5cbb168d..acb6204b 100644 --- a/modules/SIPMacros.cmake +++ b/modules/SIPMacros.cmake @@ -43,7 +43,6 @@ SET(SIP_EXTRA_OPTIONS) MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) - FIND_FILE(_print_status_cmake print_status.cmake PATHS ${CMAKE_MODULE_PATH}) # FIXME this removes -fvisibility=hidden from the compiler flags and has global affect. STRING(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) @@ -101,7 +100,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) ENDIF(NOT WIN32) ADD_CUSTOM_COMMAND( OUTPUT ${_sip_output_files} - COMMAND ${CMAKE_COMMAND} ${_message} -P ${_print_status_cmake} + COMMAND ${CMAKE_COMMAND} -E echo ${message} COMMAND ${TOUCH_COMMAND} ${_sip_output_files} COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} DEPENDS ${_abs_module_sip} diff --git a/modules/print_status.cmake b/modules/print_status.cmake deleted file mode 100644 index 907ccba6..00000000 --- a/modules/print_status.cmake +++ /dev/null @@ -1,2 +0,0 @@ -# Print a status message. Useful when you want to say something from a command in cmake. -MESSAGE(STATUS ${MESSAGE}) |