← Back to branch summary

~sil2100/compiz/quickfix_1141079_raring

« back to all changes in this revision

Viewing changes to compizconfig/mocks/libcompizconfig/CMakeLists.txt

  • Committer: Tarmac
  • Author(s): Sam Spilsbury, Brandon Schaefer
  • Date: 2013-02-22 05:32:31 UTC
  • mfrom: (3617.1.15 compiz.fix_1130679)
  • Revision ID: tarmac-20130222053231-dlp3151si62x4dw9
Fix startup issues

Amalgamated changes:

0. Re-set the setting parents correctly after an upgrade
1. Move the backend loading and config file handling code into separate objects, we need to inject them by interface in order to isolate CCSContextDefaultImpl for testing
2. Add the ccp plugin to "initialPlugins" rather than setting the option directly, that never worked.
3. Added some framework to force-import any profile available in the system config dirs and not reported as existing by the backing. This is so that we have a guaruntee that we will get its values
4. Bail out correctly when a schema couldn't be found

(LP: #1130679). Fixes: https://bugs.launchpad.net/bugs/1130679.

Approved by Brandon Schaefer, PS Jenkins bot, Łukasz Zemczak.

Show diffs side-by-side

added added

removed removed

Lines of Context:
compizconfig/mocks/libcompizconfig/CMakeLists.txt
25
25
add_library (compizconfig_ccs_text_file_mock
26
26
             ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_text_file_mock.cpp)
27
27
 
 
28
add_library (compizconfig_ccs_backend_loader_mock
 
29
             ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_backend_loader_mock.cpp)
 
30
 
 
31
add_library (compizconfig_ccs_config_file_mock
 
32
             ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_config_file_mock.cpp)
 
33
 
28
34
add_library (compizconfig_ccs_integration_mock
29
35
             ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_integration_mock.cpp)
30
36
 
75
81
                       ${GMOCK_MAIN_LIBRARY}
76
82
                       ${CMAKE_THREAD_LIBS_INIT})
77
83
 
 
84
target_link_libraries (compizconfig_ccs_config_file_mock
 
85
                       ${GTEST_BOTH_LIBRARIES}
 
86
                       ${GMOCK_LIBRARY}
 
87
                       ${GMOCK_MAIN_LIBRARY}
 
88
                       ${CMAKE_THREAD_LIBS_INIT}
 
89
                       compizconfig)
 
90
 
 
91
target_link_libraries (compizconfig_ccs_backend_loader_mock
 
92
                       ${GTEST_BOTH_LIBRARIES}
 
93
                       ${GMOCK_LIBRARY}
 
94
                       ${GMOCK_MAIN_LIBRARY}
 
95
                       ${CMAKE_THREAD_LIBS_INIT}
 
96
                       compizconfig)
 
97
 
78
98
target_link_libraries (compizconfig_ccs_integration_mock
79
99
                       ${GTEST_BOTH_LIBRARIES}
80
100
                       ${GMOCK_LIBRARY}