diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-10 01:46:23 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-10 01:46:23 -0500 |
| commit | dfb75324af3dfdb983f354782c6025f37e665ee5 (patch) | |
| tree | 776c8911b5ac2dbd6bd1ee2f9692ace3f4199e51 | |
| parent | 1e959a2aeca4499a1b8a79d1793953348638b69f (diff) | |
| download | tdebase-dfb75324af3dfdb983f354782c6025f37e665ee5.tar.gz tdebase-dfb75324af3dfdb983f354782c6025f37e665ee5.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!
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | twin/clients/keramik/CMakeLists.txt | 17 |
3 files changed, 9 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b87e76ee7..31fb46c43 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 ################# @@ -157,6 +158,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 ) + ##### tdebase directories ####################### diff --git a/config.h.cmake b/config.h.cmake index a334fe786..39d6d8528 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -3,6 +3,9 @@ // Defined if you have fvisibility and fvisibility-inlines-hidden support. #cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 +// Defined if compiler supports long long type. +#cmakedefine HAVE_LONG_LONG 1 + // konsole #cmakedefine HAVE_PROC_CWD 1 diff --git a/twin/clients/keramik/CMakeLists.txt b/twin/clients/keramik/CMakeLists.txt index 67e739d48..89f563d3a 100644 --- a/twin/clients/keramik/CMakeLists.txt +++ b/twin/clients/keramik/CMakeLists.txt @@ -42,22 +42,11 @@ tde_add_kpart( twin3_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 |