marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake: Don't try to create openclonk.png without convert

scancodes-fix
Günther Brammer 2013-03-09 17:45:27 +01:00
parent 12c8b31a10
commit 1075822af3
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -1461,22 +1461,24 @@ install(
CODE CODE
"execute_process( "execute_process(
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target data COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target data
)" )"
) )
FIND_PACKAGE(ImageMagick COMPONENTS convert) FIND_PACKAGE(ImageMagick COMPONENTS convert)
add_custom_command( if(ImageMagick_convert_FOUND)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/openclonk.png add_custom_command(
COMMAND convert "${CMAKE_CURRENT_SOURCE_DIR}/src/res/oc.ico[2]" "${CMAKE_CURRENT_BINARY_DIR}/openclonk.png" OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/openclonk.png
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/res/oc.ico COMMAND "${ImageMagick_convert_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/src/res/oc.ico[2]" "${CMAKE_CURRENT_BINARY_DIR}/openclonk.png"
VERBATIM MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/res/oc.ico
VERBATIM
) )
add_custom_target(icon DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/openclonk.png) add_custom_target(icon DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/openclonk.png)
add_dependencies(data icon) add_dependencies(data icon)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/openclonk.png FILES ${CMAKE_CURRENT_BINARY_DIR}/openclonk.png
DESTINATION share/icons/hicolor/48x48/apps DESTINATION share/icons/hicolor/48x48/apps
) )
endif()
set(OC_C4GROUPS set(OC_C4GROUPS
Graphics.ocg Graphics.ocg
@ -1546,7 +1548,7 @@ add_custom_command(
) )
add_custom_target(setup add_custom_target(setup
DEPENDS setup_openclonk.exe DEPENDS setup_openclonk.exe groups
) )
############################################################################ ############################################################################