-give kdelibs a project name ("kdelibs")

-remove the unused "install_icon" targets
-mark more variables as "ADVANCED"

Alex



svn path=/trunk/KDE/kdelibs/; revision=510649

3 files changed, 45 insertions, 29 deletions

diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake
index 91ca3621..80a1445f 100644
--- a/modules/FindOpenEXR.cmake
+++ b/modules/FindOpenEXR.cmake
@@ -63,6 +63,12 @@ else (OPENEXR_FOUND)
   endif (OpenEXR_FIND_REQUIRED)
 endif (OPENEXR_FOUND)
 
-MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES)
+MARK_AS_ADVANCED(
+   OPENEXR_INCLUDE_DIR 
+   OPENEXR_LIBRARIES 
+   OPENEXR_ILMIMF_LIBRARY 
+   OPENEXR_IMATH_LIBRARY 
+   OPENEXR_IEX_LIBRARY 
+   OPENEXR_HALF_LIBRARY )
 
 
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake
index 49934fd3..28286f94 100644
--- a/modules/FindTIFF.cmake
+++ b/modules/FindTIFF.cmake
@@ -18,10 +18,21 @@ FIND_LIBRARY(TIFF_LIBRARY
   PATHS /usr/lib /usr/local/lib

   )

 

-if(TIFF_INCLUDE_DIR)

-  if(TIFF_LIBRARY)

-    set( TIFF_FOUND "YES" )

-    set( TIFF_LIBRARIES ${TIFF_LIBRARY} )

-  endif(TIFF_LIBRARY)

-endif(TIFF_INCLUDE_DIR)

 

+if(TIFF_INCLUDE_DIR AND TIFF_LIBRARY)

+   set(TIFF_FOUND "YES")

+   set(TIFF_LIBRARIES ${TIFF_LIBRARY} )

+endif(TIFF_INCLUDE_DIR AND TIFF_LIBRARY)

+

+

+if (TIFF_FOUND)

+   if (NOT TIFF_FIND_QUIETLY)

+      message(STATUS "Found TIFF: ${TIFF_LIBRARY}")

+   endif (NOT TIFF_FIND_QUIETLY)

+else (TIFF_FOUND)

+   if (TIFF_FIND_REQUIRED)

+      message(FATAL_ERROR "Could NOT find TIFF")

+   endif (TIFF_FIND_REQUIRED)

+endif (TIFF_FOUND)

+

+MARK_AS_ADVANCED( TIFF_INCLUDE_DIR TIFF_LIBRARY )

diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 3a88d033..6b485cba 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -262,7 +262,6 @@ ENDMACRO(KDE4_AUTOMOC)
 
 
 MACRO(KDE4_INSTALL_ICONS _theme _defaultpath )
-   ADD_CUSTOM_TARGET(install_icons )
    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n")
    FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "set(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n")
 
@@ -272,34 +271,34 @@ MACRO(KDE4_INSTALL_ICONS _theme _defaultpath )
       STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
       STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name  "${_current_ICON}")
       # if the string doesn't match the pattern, the result is the full string, so all three have the same content
- 	   if( NOT ${_size} STREQUAL ${_name} )
-	 	   set(_icon_GROUP "actions")
+      if( NOT ${_size} STREQUAL ${_name} )
+         set(_icon_GROUP "actions")
 
-      	if(${_group} STREQUAL "mime")
-        	   set(_icon_GROUP  "mimetypes")
-      	endif(${_group} STREQUAL "mime")
+         if(${_group} STREQUAL "mime")
+            set(_icon_GROUP  "mimetypes")
+         endif(${_group} STREQUAL "mime")
 
-      	if(${_group} STREQUAL "filesys")
-         	set(_icon_GROUP  "filesystems")
-      	endif(${_group} STREQUAL "filesys")
+         if(${_group} STREQUAL "filesys")
+            set(_icon_GROUP  "filesystems")
+         endif(${_group} STREQUAL "filesys")
 
-      	if(${_group} STREQUAL "device")
-         	set(_icon_GROUP  "devices")
-      	endif(${_group} STREQUAL "device")
+         if(${_group} STREQUAL "device")
+            set(_icon_GROUP  "devices")
+         endif(${_group} STREQUAL "device")
 
-      	if(${_group} STREQUAL "app")
-         	set(_icon_GROUP  "apps")
-      	endif(${_group} STREQUAL "app")
+         if(${_group} STREQUAL "app")
+            set(_icon_GROUP  "apps")
+         endif(${_group} STREQUAL "app")
 
-      	if(${_group} STREQUAL "action")
-         	set(_icon_GROUP  "actions")
-      	endif(${_group} STREQUAL "action")
+         if(${_group} STREQUAL "action")
+            set(_icon_GROUP  "actions")
+         endif(${_group} STREQUAL "action")
 
 #      message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
-      	set(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
-      	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
-      	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
-	   endif( NOT ${_size} STREQUAL ${_name} )
+         set(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
+         FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
+         FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
+      endif( NOT ${_size} STREQUAL ${_name} )
    endforeach (_current_ICON)
    FILE(GLOB _icons *.svgz)
    foreach(_current_ICON ${_icons} )