diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-10 01:46:23 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-13 21:27:50 +0200 |
| commit | 4fd3190e4465a5756a953b6beb1ab7b01f6d03aa (patch) | |
| tree | afe196aac899640a03a39e3d30e38ca9ce9d1c18 | |
| parent | 5a0055f9ddbf20dcca89fef962bccd7c6f225e4a (diff) | |
| download | tdebase-4fd3190e4465a5756a953b6beb1ab7b01f6d03aa.tar.gz tdebase-4fd3190e4465a5756a953b6beb1ab7b01f6d03aa.zip | |
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 dfb75324af3dfdb983f354782c6025f37e665ee5)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | kwin/clients/keramik/CMakeLists.txt | 17 |
3 files changed, 9 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d31ade4c1..5f28c9f6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ####################### diff --git a/config.h.cmake b/config.h.cmake index 1c37917fb..ba80cabac 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -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 diff --git a/kwin/clients/keramik/CMakeLists.txt b/kwin/clients/keramik/CMakeLists.txt index 851f44a9a..8992b4606 100644 --- a/kwin/clients/keramik/CMakeLists.txt +++ b/kwin/clients/keramik/CMakeLists.txt @@ -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 |