[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/cmake/modules
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-01-29 9:30:31
Message-ID: 1233221431.789763.24999.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918107 by apaku:

Fix finding libical headers and also use TO_CMAKE_PATH instead of
string-replacing.


 M  +6 -11     FindLibical.cmake  


--- trunk/KDE/kdepimlibs/cmake/modules/FindLibical.cmake #918106:918107
@@ -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})
 


[prev in list] [next in list] [prev in thread] [next in thread]