← Back to branch summary

~compiz-team/compiz/build-fixes-part-6-remove-pyclean

« back to all changes in this revision

Viewing changes to plugins/wall/src/offset_movement/CMakeLists.txt

  • Committer: smspillaz
  • Date: 2012-05-18 15:09:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3203.
  • Revision ID: sam.spilsbury@canonical.com-20120518150903-1mcn0owmlk3qdoti
Fix libcompiz_core being rebuilt with totally different cflags.

Split CompRegion into a new static library and link the wall plugin tests
against that. There is some strange behaviour going on in CMake that the
author does not understand here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/wall/src/offset_movement/CMakeLists.txt
1
 
pkg_check_modules (
2
 
  GLIBMM
3
 
  REQUIRED
4
 
  glibmm-2.4 glib-2.0 compiz
5
 
)
6
 
 
7
1
INCLUDE_DIRECTORIES (  
8
2
  ${CMAKE_CURRENT_SOURCE_DIR}/include
9
3
  ${CMAKE_CURRENT_SOURCE_DIR}/src
10
 
 
11
 
  ${CMAKE_SOURCE_DIR}/include
12
4
    
13
5
  ${Boost_INCLUDE_DIRS}
14
6
  
15
7
  ${GLIBMM_INCLUDE_DIRS}
16
8
)
17
9
 
18
 
LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
19
 
 
20
 
SET ( 
21
 
  PUBLIC_HEADERS 
22
 
)
 
10
LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS} ${COMPIZ_LIBRARY_DIRS}) 
23
11
 
24
12
SET ( 
25
13
  PRIVATE_HEADERS
36
24
  
37
25
  ${SRCS}
38
26
  
39
 
  ${PUBLIC_HEADERS}
40
27
  ${PRIVATE_HEADERS}
41
28
)
42
29
 
44
31
ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
45
32
endif (COMPIZ_BUILD_TESTING)
46
33
 
47
 
SET_TARGET_PROPERTIES(
48
 
  compiz_wall_offset_movement PROPERTIES
49
 
  PUBLIC_HEADER "${PUBLIC_HEADERS}"
50
 
)
51
 
 
52
34
TARGET_LINK_LIBRARIES(
53
35
  compiz_wall_offset_movement
54
36
 
55
 
  compiz_core
56
 
  ${GLIBMM_LIBRARIES}
 
37
  compiz_rect
 
38
  compiz_region
57
39
)