diff -Nurd kdepimlibs-4.2.1/cmake/modules/FindLibical.cmake kdepimlibs-4.2.1-qgpg/cmake/modules/FindLibical.cmake --- kdepimlibs-4.2.1/cmake/modules/FindLibical.cmake 2009-02-26 09:15:40.000000000 -0500 +++ kdepimlibs-4.2.1-qgpg/cmake/modules/FindLibical.cmake 2009-03-15 18:13:54.000000000 -0400 @@ -16,7 +16,6 @@ if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) - string(REPLACE "\\" "/" _program_FILES_DIR "${_program_FILES_DIR}") endif(WIN32) set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED}) @@ -28,25 +27,21 @@ endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES) #set the root from the LIBICAL_BASE environment -string(REPLACE "\\" "/" libical_root "$ENV{LIBICAL_BASE}") +file(TO_CMAKE_PATH "$ENV{LIBICAL_BASE}" libical_root ) #override the root from LIBICAL_BASE defined to cmake if(DEFINED LIBICAL_BASE) - string(REPLACE "\\" "/" libical_root ${LIBICAL_BASE}) + file(TO_CMAKE_PATH "${LIBICAL_BASE}" libical_root ) endif(DEFINED LIBICAL_BASE) -find_path(LIBICAL_INCLUDE_DIRS NAMES ical.h - PATH_SUFFIXES libical - PATHS ${libical_root}/include ${_program_FILES_DIR}/libical/include /usr/local/include /usr/include ${KDE4_INCLUDE_DIR} - NO_CMAKE_SYSTEM_PATH +find_path(LIBICAL_INCLUDE_DIRS NAMES libical/ical.h + HINTS ${libical_root}/include ${_program_FILES_DIR}/libical/include ${KDE4_INCLUDE_DIR} ) find_library(LIBICAL_LIBRARY NAMES ical libical - PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib ${KDE4_LIB_DIR} - NO_CMAKE_SYSTEM_PATH + HINTS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib ${KDE4_LIB_DIR} ) find_library(LIBICALSS_LIBRARY NAMES icalss libicalss - PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib ${KDE4_LIB_DIR} - NO_CMAKE_SYSTEM_PATH + HINTS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib ${KDE4_LIB_DIR} ) set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY}) diff -Nurd kdepimlibs-4.2.1/kcal/CMakeLists.txt kdepimlibs-4.2.1-qgpg/kcal/CMakeLists.txt --- kdepimlibs-4.2.1/kcal/CMakeLists.txt 2008-12-04 03:34:06.000000000 -0500 +++ kdepimlibs-4.2.1-qgpg/kcal/CMakeLists.txt 2009-03-15 18:13:54.000000000 -0400 @@ -17,6 +17,7 @@ include_directories( ${LIBICAL_INCLUDE_DIRS} ${LIBICAL_INCLUDE_DIRS}/libical + ${LIBICAL_INCLUDE_DIRS}/.. ${CMAKE_CURRENT_SOURCE_DIR}/versit ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/kabc