From: <pl...@us...> - 2007-04-28 11:21:34
|
Revision: 8023 http://svn.sourceforge.net/rosegarden/?rev=8023&view=rev Author: plcl Date: 2007-04-28 04:21:33 -0700 (Sat, 28 Apr 2007) Log Message: ----------- Buildsystem revision: use kde-config --install paths everywhere Modified Paths: -------------- trunk/rosegarden/CMakeLists.txt trunk/rosegarden/cmake_admin/FindKDECONFIG.cmake trunk/rosegarden/cmake_admin/FindMSGFMT.cmake trunk/rosegarden/cmake_admin/FindPCHSupport.cmake trunk/rosegarden/docs/CMakeLists.txt trunk/rosegarden/src/CMakeLists.txt Modified: trunk/rosegarden/CMakeLists.txt =================================================================== --- trunk/rosegarden/CMakeLists.txt 2007-04-22 22:58:26 UTC (rev 8022) +++ trunk/rosegarden/CMakeLists.txt 2007-04-28 11:21:33 UTC (rev 8023) @@ -303,7 +303,7 @@ # create and install the version file FILE(WRITE version.txt "${VERSION}\n") INSTALL( FILES version.txt - DESTINATION share/apps/rosegarden ) + DESTINATION ${KDE3DATADIR}/rosegarden ) # uninstall custom target CONFIGURE_FILE( Modified: trunk/rosegarden/cmake_admin/FindKDECONFIG.cmake =================================================================== --- trunk/rosegarden/cmake_admin/FindKDECONFIG.cmake 2007-04-22 22:58:26 UTC (rev 8022) +++ trunk/rosegarden/cmake_admin/FindKDECONFIG.cmake 2007-04-28 11:21:33 UTC (rev 8023) @@ -1,14 +1,16 @@ -# Find the kde-config program +# Find the kde-config program and retrieve the install dirs # # Variables: # HAVE_KDECONFIG -# KDECONFIG_EXECUTABLE -# KDE3PREFIX +# KDECONFIG_EXECUTABLE +# KDE3PREFIX # KDE3HTMLDIR # KDE3DATADIR # KDE3ICONDIR # KDE3MIMEDIR # KDE3MENUDIR +# KDE3EXECDIR +# KDE3L18NDIR IF(KDECONFIG_EXECUTABLE) SET(HAVE_KDECONFIG TRUE) @@ -72,3 +74,19 @@ STRING(REPLACE "${KDE3PREFIX}/" "" KDE3MENUDIR "${_menuinstalldir}") MESSAGE(STATUS "KDE3MENUDIR : ${KDE3MENUDIR}") ENDIF(NOT KDE3MENUDIR) + +IF(NOT KDE3L18NDIR) + EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install locale + OUTPUT_VARIABLE _l18ninstalldir) + STRING(REGEX REPLACE "\n" "" _l18ninstalldir "${_l18ninstalldir}") + STRING(REPLACE "${KDE3PREFIX}/" "" KDE3L18NDIR "${_l18ninstalldir}") + MESSAGE(STATUS "KDE3L18NDIR : ${KDE3L18NDIR}") +ENDIF(NOT KDE3L18NDIR) + +IF(NOT KDE3EXECDIR) + EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --expandvars --install exe + OUTPUT_VARIABLE _execinstalldir) + STRING(REGEX REPLACE "\n" "" _execinstalldir "${_execinstalldir}") + STRING(REPLACE "${KDE3PREFIX}/" "" KDE3EXECDIR "${_execinstalldir}") + MESSAGE(STATUS "KDE3EXECDIR : ${KDE3EXECDIR}") +ENDIF(NOT KDE3EXECDIR) Modified: trunk/rosegarden/cmake_admin/FindMSGFMT.cmake =================================================================== --- trunk/rosegarden/cmake_admin/FindMSGFMT.cmake 2007-04-22 22:58:26 UTC (rev 8022) +++ trunk/rosegarden/cmake_admin/FindMSGFMT.cmake 2007-04-28 11:21:33 UTC (rev 8023) @@ -20,7 +20,7 @@ ELSE(MSGFMT_EXECUTABLE) IF(NOT MSGFMT_FIND_QUIETLY) IF(MSGFMT_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "msgfmt program couldn't be found") + MESSAGE(FATAL_ERROR "msgfmt program couldn't be found") ENDIF(MSGFMT_FIND_REQUIRED) ENDIF(NOT MSGFMT_FIND_QUIETLY) ENDIF(MSGFMT_EXECUTABLE) @@ -30,17 +30,17 @@ MACRO(ADD_TRANSLATIONS _baseName) SET(_outputs) FOREACH(_file ${ARGN}) - GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE) - SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.gmo") - SET(_in "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po") - ADD_CUSTOM_COMMAND( - OUTPUT ${_out} - COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in} - DEPENDS ${_in} ) - INSTALL(FILES ${_out} - DESTINATION share/locale/${_file_we}/LC_MESSAGES/ - RENAME ${_baseName}.mo ) - SET(_outputs ${_outputs} ${_out}) + GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE) + SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.gmo") + SET(_in "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po") + ADD_CUSTOM_COMMAND( + OUTPUT ${_out} + COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in} + DEPENDS ${_in} ) + INSTALL(FILES ${_out} + DESTINATION ${KDE3L18NDIR}/${_file_we}/LC_MESSAGES/ + RENAME ${_baseName}.mo ) + SET(_outputs ${_outputs} ${_out}) ENDFOREACH(_file) ADD_CUSTOM_TARGET(translations ALL DEPENDS ${_outputs}) ENDMACRO(ADD_TRANSLATIONS) Modified: trunk/rosegarden/cmake_admin/FindPCHSupport.cmake =================================================================== --- trunk/rosegarden/cmake_admin/FindPCHSupport.cmake 2007-04-22 22:58:26 UTC (rev 8022) +++ trunk/rosegarden/cmake_admin/FindPCHSupport.cmake 2007-04-28 11:21:33 UTC (rev 8023) @@ -8,11 +8,12 @@ # ADD_PRECOMPILED_HEADER IF(CMAKE_COMPILER_IS_GNUCXX) - EXEC_PROGRAM(${CMAKE_CXX_COMPILER} - ARGS --version OUTPUT_VARIABLE _compiler_output) - STRING(REGEX REPLACE ".* ([0-9]\\.[0-9]\\.[0-9]) .*" "\\1" - gcc_compiler_version ${_compiler_output}) - #MESSAGE("GCC Version: ${_compiler_version}") + EXEC_PROGRAM(${CMAKE_CXX_COMPILER} + ARGS -dumpversion + OUTPUT_VARIABLE gcc_compiler_version) +# STRING(REGEX REPLACE ".* ([0-9]\\.[0-9]\\.[0-9]) .*" "\\1" +# gcc_compiler_version ${_compiler_output}) +# MESSAGE("GCC Version: ${gcc_compiler_version}") IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") SET(PCHSupport_FOUND TRUE) ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]") Modified: trunk/rosegarden/docs/CMakeLists.txt =================================================================== --- trunk/rosegarden/docs/CMakeLists.txt 2007-04-22 22:58:26 UTC (rev 8022) +++ trunk/rosegarden/docs/CMakeLists.txt 2007-04-28 11:21:33 UTC (rev 8023) @@ -1,4 +1,4 @@ ADD_DOCS(rosegarden en es ja sv) -INSTALL(FILES en/tips DESTINATION share/apps/rosegarden) +INSTALL(FILES en/tips DESTINATION ${KDE3DATADIR}/rosegarden) Modified: trunk/rosegarden/src/CMakeLists.txt =================================================================== --- trunk/rosegarden/src/CMakeLists.txt 2007-04-22 22:58:26 UTC (rev 8022) +++ trunk/rosegarden/src/CMakeLists.txt 2007-04-28 11:21:33 UTC (rev 8023) @@ -120,16 +120,16 @@ # Install targets INSTALL(TARGETS rosegarden rosegardensequencer - RUNTIME DESTINATION bin) + RUNTIME DESTINATION ${KDE3EXECDIR} ) # Install helper scripts INSTALL(PROGRAMS helpers/rosegarden-lilypondview helpers/rosegarden-project-package helpers/rosegarden-audiofile-importer - DESTINATION bin ) + DESTINATION ${KDE3EXECDIR} ) # Install GUI resource files FILE(GLOB RC_FILES gui/ui/*.rc) INSTALL(FILES ${RC_FILES} - DESTINATION share/apps/rosegarden ) + DESTINATION ${KDE3DATADIR}/rosegarden ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |