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

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Maciej Mrozowski <reavertm () gmail ! com>
Date:       2010-07-23 12:11:58
Message-ID: 20100723121158.7F1D1AC7AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1153514 by mmrozowski:

Remove automagic dependency on Dmtx, remove excessive MESSAGE(STATUS ...) - \
macro_log_feature is sufficient, if any - custom MESSAGE(STATUS ...) should be placed \
in FindDmtx.cmake instead.

 M  +4 -4      cmake/modules/FindDmtx.cmake  
 M  +2 -6      klipper/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/cmake/modules/FindDmtx.cmake #1153513:1153514
@@ -12,17 +12,17 @@
 
 if(DMTX_INCLUDE_DIR AND DMTX_LIBRARIES)
   # in cache already
-  SET(DTMX_FOUND TRUE)
+  set(DTMX_FOUND TRUE)
 else (DMTX_INCLUDE_DIR AND DMTX_LIBRARIES)
 
-  FIND_PATH(DMTX_INCLUDE_DIR dmtx.h)
+  find_path(DMTX_INCLUDE_DIR dmtx.h)
 
-  FIND_LIBRARY(DMTX_LIBRARIES NAMES dmtx)
+  find_library(DMTX_LIBRARIES NAMES dmtx)
 
   if (DMTX_INCLUDE_DIR AND DMTX_LIBRARIES)
      set(DMTX_FOUND TRUE)
   endif (DMTX_INCLUDE_DIR AND DMTX_LIBRARIES)
 
-  MARK_AS_ADVANCED(DMTX_INCLUDE_DIR DMTX_LIBRARIES)
+  mark_as_advanced(DMTX_INCLUDE_DIR DMTX_LIBRARIES)
 
 endif (DMTX_INCLUDE_DIR AND DMTX_LIBRARIES)
--- trunk/KDE/kdebase/workspace/klipper/CMakeLists.txt #1153513:1153514
@@ -1,7 +1,5 @@
 kde4_no_enable_final(klipper)
 
-find_package(Dmtx)
-
 set(libklipper_common_SRCS
     klipper.cpp
     urlgrabber.cpp
@@ -19,15 +17,13 @@
     clipcommandprocess.cpp
 )
 
+macro_optional_find_package(Dmtx)
+macro_log_feature(DMTX_FOUND "Dmtx" "Datamatrix library" "http://www.libdmtx.org" \
FALSE "" "Needed to create mobile barcodes from clipboard data")  if(DMTX_FOUND)
-    MESSAGE(STATUS "Found Datamatrix library, will use it to give possibility to \
                show mobile barcodes of clipboard data")
     set(libklipper_common_SRCS ${libklipper_common_SRCS} mobilebarcode.cpp)
     add_definitions(-DHAVE_DMTX)
-else(DMTX_FOUND)
-    MESSAGE(STATUS "Datamatrix library not found. Consider installing it to create \
mobile barcodes from clipboard data. See http://wwwlibdmtx.org")  endif(DMTX_FOUND)
 
-macro_log_feature(DMTX_FOUND "Dmtx" "Datamatrix library" "http://www.libdmtx.org" \
FALSE "" "Needed to provide create mobile barcodes from clipboard data")  \
include_directories(${QNTRACK_INCLUDE_DIR})  
 


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