diff options
| author | Andreas Holzammer <andy@kdab.com> | 2010-07-15 06:54:49 +0000 |
|---|---|---|
| committer | Andreas Holzammer <andy@kdab.com> | 2010-07-15 06:54:49 +0000 |
| commit | 7d4801824eef8a80d71ada8c9dc3141d1cbe1a99 (patch) | |
| tree | 26b1639f3e0f2f806e8985de67477dd9eb03633d | |
| parent | c4121ccdf7bee285338b7d591e18ce756a5595ad (diff) | |
| download | extra-cmake-modules-7d4801824eef8a80d71ada8c9dc3141d1cbe1a99.tar.gz extra-cmake-modules-7d4801824eef8a80d71ada8c9dc3141d1cbe1a99.tar.bz2 | |
- fixed finding of png2ico for desktop builds
svn path=/trunk/KDE/kdelibs/; revision=1150127
| -rw-r--r-- | modules/KDE4Macros.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index c235b34e..9c7f7e59 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -1094,7 +1094,11 @@ endmacro (KDE4_CREATE_HTML_HANDBOOK) macro (KDE4_ADD_WIN32_APP_ICON appsources) message(STATUS "KDE4_ADD_WIN32_APP_ICON() is deprecated, use KDE4_ADD_APP_ICON() instead") if (WIN32) + if(NOT WINCE) + find_program(PNG2ICO_EXECUTABLE NAMES png2ico) + else(NOT WINCE) find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR} NO_DEFAULT_PATH ) + endif(NOT WINCE) find_program(WINDRES_EXECUTABLE NAMES windres) if(MSVC) set(WINDRES_EXECUTABLE TRUE) @@ -1126,7 +1130,11 @@ macro (KDE4_ADD_APP_ICON appsources pattern) set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources}) if (WIN32) + if(NOT WINCE) + find_program(PNG2ICO_EXECUTABLE NAMES png2ico) + else(NOT WINCE) find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR} NO_DEFAULT_PATH ) + endif(NOT WINCE) find_program(WINDRES_EXECUTABLE NAMES windres) if(MSVC) set(WINDRES_EXECUTABLE TRUE) |