Fix Keramic data file installation and add long long check to CMake

This closes Bug 905
Thanks to Roman Savochenko and Leandro Nini for the patches!
(cherry picked from commit dfb75324af)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 5a0055f9dd
commit 4fd3190e44

@ -27,6 +27,7 @@ include( CheckCXXSourceCompiles )
include( CheckLibraryExists )
include( CheckFunctionExists )
include( CheckStructHasMember )
include( CheckTypeSize )
##### include our cmake modules #################
@ -152,6 +153,8 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
check_type_size( "long long" LONG_LONG )
##### kdebase directories #######################

@ -1,5 +1,8 @@
#define VERSION "@VERSION@"
// Defined if compiler supports long long type.
#cmakedefine HAVE_LONG_LONG 1
// konsole
#cmakedefine HAVE_PROC_CWD 1

@ -42,22 +42,11 @@ tde_add_kpart( kwin3_keramik AUTOMOC
##### tiles.h (header) ##########################
set( pics
pics/caption-large-left.png pics/caption-small-right.png
pics/titlebar-center.png pics/titlebutton-square.png
pics/border-left.png pics/caption-large-right.png
pics/grabbar-center.png pics/titlebar-left.png
pics/border-right.png pics/caption-small-center.png
pics/grabbar-left.png pics/titlebar-right.png
pics/caption-large-center.png pics/caption-small-left.png
pics/grabbar-right.png pics/titlebutton-round.png
pics/bottom-left.png pics/bottom-right.png pics/bottom-center.png
pics/titlebutton-square-large.png pics/titlebutton-square-huge.png
pics/titlebutton-round-large.png pics/titlebutton-round-huge.png )
file(GLOB _pics "${CMAKE_CURRENT_SOURCE_DIR}/pics/*.png" )
add_custom_command( OUTPUT tiles.h
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${pics}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${pics} )
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${_pics}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/embedtool ${_pics} )
tde_add_executable( embedtool
SOURCES embedtool.cpp

Loading…
Cancel
Save