From dea15da2d6982e70e433fdff2b3174cde4bab6f9 Mon Sep 17 00:00:00 2001 From: rikky Date: Sun, 6 Mar 2011 23:38:31 +0000 Subject: [PATCH] Fix:build/cmake:Revert 4308 as it doesn't fix the error and prevents use of convert on windows git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4311 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/CMakeLists.txt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 182c177..8319f4f 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -128,8 +128,6 @@ if(OPENSSL_CRYPTO_LIBRARIES) endif() if(PNG_FOUND) set(HAVE_PNG 1) - include_directories(${PNG_INCLUDE_DIRS}) - list(APPEND NAVIT_LIBS ${PNG_LIBRARY}) else(PNG_FOUND) message(STATUS "using internal libpng") set_with_reason(support/libpng "native libpng missing" TRUE) @@ -411,15 +409,12 @@ if(ANDROID) endif(ANDROID) # Image conversion -if(NOT WIN32) -#convert.exe on windows deals with filesystems, not images:D - find_program(IMAGE_CONVERTER NAMES convert) - execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) - if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") - message(STATUS ${IMAGE_CONVERTER}) - set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) - endif() -endif(NOT WIN32) +find_program(IMAGE_CONVERTER NAMES convert) +execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) +if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") + message(STATUS ${IMAGE_CONVERTER}) + set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) +endif() if (SVG2PNG) if (NOT IMAGE_CONVERTER_SVGZ) -- 2.7.4