immibis
/
colobot-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make music/CMakeLists.txt status messages more accurate

coolant-mod
Piotr Dziwinski 2015-07-24 23:05:05 +02:00
parent d2acc1e424
commit e5c9e86e5f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
music/CMakeLists.txt
View File

@ -67,7 +67,7 @@ if(MUSIC)
message(FATAL_ERROR "wget not found, music files can't be downloaded!") message(FATAL_ERROR "wget not found, music files can't be downloaded!")
endif() endif()
message(STATUS "Downloading ${DOWNLOAD_FILE} ...") message(STATUS "Adding download target for ${DOWNLOAD_FILE}")
add_custom_target( add_custom_target(
download-${FILENAME} download-${FILENAME}
@ -80,10 +80,10 @@ if(MUSIC)
if(MUSIC_FLAC) if(MUSIC_FLAC)
if(DOWNLOAD_FILE MATCHES ".ogg") if(DOWNLOAD_FILE MATCHES ".ogg")
message(STATUS "Installing ${FILE} (FLAC not available) ...") message(STATUS "Adding install target for ${FILE} (FLAC not available)")
install(FILES ${DOWNLOAD_FILE_LOC} DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR}) install(FILES ${DOWNLOAD_FILE_LOC} DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR})
else() else()
message(STATUS "Converting ${FILE} to OGG ...") message(STATUS "Adding OGG convert target for ${FILE}")
add_custom_command( add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.ogg" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.ogg"
COMMAND ${OGGENC} -q ${MUSIC_QUALITY} -o "${FILENAME}.ogg" "${DOWNLOAD_FILE_LOC}" COMMAND ${OGGENC} -q ${MUSIC_QUALITY} -o "${FILENAME}.ogg" "${DOWNLOAD_FILE_LOC}"
@ -93,7 +93,7 @@ if(MUSIC)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.ogg DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.ogg DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR})
endif() endif()
else() else()
message(STATUS "Installing ${FILE} ...") message(STATUS "Adding install target for ${FILE}")
install(FILES ${DOWNLOAD_FILE_LOC} DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR}) install(FILES ${DOWNLOAD_FILE_LOC} DESTINATION ${COLOBOT_INSTALL_MUSIC_DIR})
endif() endif()
endforeach() endforeach()