Merge lp:~vanvugt/compiz-core/fix-919948.2 into lp:compiz-core/0.9.5

[Daniel van Vugt]

Don't install lib/libcompiz_*.a because they're already installed inside lib/libcompiz_core.so (LP: #919948)

CMake doesn't let you install a "TARGET" without also installing all of its libraries/archives. So install just the files we want, explicitly.

[Sam Spilsbury (smspillaz)]

It should be possible to just install the headers, see core/include/CMakeLists.txt

[Daniel van Vugt (vanvugt)]

Hmm, yes. That might work if you remove "TARGETS ..." from the install rules and install the headers as a list of files instead of properties of a target.

If you keep "TARGETS ..." in the install rules then you can't stop CMake from installing the archives (*.a). Either that or it gives you an error saying you forgot to install your archives/libraries.

[Alan Griffiths (alan-griffiths)]

Looks OK

review: Approve

=== modified file 'cmake/CompizDefaults.cmake'
--- cmake/CompizDefaults.cmake	2011-07-27 16:13:28 +0000
+++ cmake/CompizDefaults.cmake	2012-01-23 10:46:23 +0000
@@ -1,5 +1,6 @@
 set (COMPIZ_PREFIX ${CMAKE_INSTALL_PREFIX})
 set (COMPIZ_INCLUDEDIR ${includedir})
+set (COMPIZ_CORE_INCLUDE_DIR ${includedir}/compiz/core)
 set (COMPIZ_LIBDIR ${libdir})
 
 list (APPEND COMPIZ_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/include)
@@ -13,4 +14,4 @@
 
 set (COMPIZ_PLUGIN_INSTALL_TYPE "package")
 
-set (_COMPIZ_INTERNAL 1)
\ No newline at end of file
+set (_COMPIZ_INTERNAL 1)

=== modified file 'include/core/CMakeLists.txt'
--- include/core/CMakeLists.txt	2012-01-20 15:13:40 +0000
+++ include/core/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -24,7 +24,4 @@
     deg2rad.h
 )
 
-install (
-    FILES ${_headers}
-    DESTINATION ${COMPIZ_DESTDIR}${includedir}/compiz/core
-)
+install (FILES ${_headers} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})

=== modified file 'src/logmessage/CMakeLists.txt'
--- src/logmessage/CMakeLists.txt	2012-01-16 07:29:26 +0000
+++ src/logmessage/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -28,10 +28,4 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_logmessage
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})

=== modified file 'src/pluginclasshandler/CMakeLists.txt'
--- src/pluginclasshandler/CMakeLists.txt	2012-01-16 07:29:26 +0000
+++ src/pluginclasshandler/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -42,10 +42,4 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_pluginclasshandler
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})

=== modified file 'src/point/CMakeLists.txt'
--- src/point/CMakeLists.txt	2012-01-19 19:16:27 +0000
+++ src/point/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -50,15 +50,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_point
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES( 
   compiz_point

=== modified file 'src/rect/CMakeLists.txt'
--- src/rect/CMakeLists.txt	2012-01-19 19:32:29 +0000
+++ src/rect/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -48,15 +48,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_rect
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES( 
   compiz_rect

=== modified file 'src/string/CMakeLists.txt'
--- src/string/CMakeLists.txt	2011-12-19 07:06:22 +0000
+++ src/string/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -26,10 +26,4 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_string
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz
-)
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})

=== modified file 'src/timer/CMakeLists.txt'
--- src/timer/CMakeLists.txt	2012-01-16 07:29:26 +0000
+++ src/timer/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -53,15 +53,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_timer
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES( 
   compiz_timer

=== modified file 'src/window/constrainment/CMakeLists.txt'
--- src/window/constrainment/CMakeLists.txt	2012-01-22 09:34:55 +0000
+++ src/window/constrainment/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -51,15 +51,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_window_constrainment
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES( 
   compiz_window_constrainment

=== modified file 'src/window/extents/CMakeLists.txt'
--- src/window/extents/CMakeLists.txt	2012-01-22 09:34:55 +0000
+++ src/window/extents/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -49,15 +49,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_window_extents
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES( 
   compiz_window_extents

=== modified file 'src/window/geometry-saver/CMakeLists.txt'
--- src/window/geometry-saver/CMakeLists.txt	2012-01-22 09:34:55 +0000
+++ src/window/geometry-saver/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -51,15 +51,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_window_geometry_saver
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES ( 
   compiz_window_geometry_saver

=== modified file 'src/window/geometry/CMakeLists.txt'
--- src/window/geometry/CMakeLists.txt	2012-01-22 09:34:55 +0000
+++ src/window/geometry/CMakeLists.txt	2012-01-23 10:46:23 +0000
@@ -49,15 +49,7 @@
   PUBLIC_HEADER "${PUBLIC_HEADERS}"
 )
 
-INSTALL(
-  TARGETS                                 compiz_window_geometry
-  RUNTIME             DESTINATION         bin
-  LIBRARY             DESTINATION         lib
-  ARCHIVE             DESTINATION         lib
-  PUBLIC_HEADER       DESTINATION         include/compiz/core
-)
-
-
+install (FILES ${PUBLIC_HEADERS} DESTINATION ${COMPIZ_CORE_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES( 
   compiz_window_geometry