← Back to branch summary

~compiz-team/compiz/compiz.fix_1041535

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Sam Spilsbury
  • Date: 2012-09-10 02:57:47 UTC
  • mfrom: (3354.1.1 compiz)
  • Revision ID: tarmac-20120910025747-uykqy567tqaj09mq
Revert r3353 as it was unreviewed and somehow got merged. Fixes: . Approved by Daniel van Vugt, jenkins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
compizconfig/libcompizconfig/tests/CMakeLists.txt
7
7
link_directories (${CMAKE_INSTALL_PREFIX}/lib)
8
8
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../mocks/libcompizconfig)
9
9
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/)
10
 
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
11
10
 
12
11
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
13
12
 
26
25
add_executable (compizconfig_test_ccs_backend
27
26
                ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_backend.cpp)
28
27
 
29
 
add_executable (compizconfig_test_ccs_text_file
30
 
                ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_text_file.cpp)
31
 
 
32
28
add_executable (compizconfig_test_ccs_mock_backend_conformance
33
29
                ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_mock_backend_conformance.cpp)
34
30
 
106
102
                       compizconfig_ccs_plugin_mock
107
103
                       compizconfig_ccs_setting_mock)
108
104
 
109
 
target_link_libraries (compizconfig_test_ccs_text_file
110
 
                       ${GTEST_BOTH_LIBRARIES}
111
 
                       ${GMOCK_LIBRARY}
112
 
                       ${GMOCK_MAIN_LIBRARY}
113
 
                       ${CMAKE_THREAD_LIBS_INIT}
114
 
                       ${LIBCOMPIZCONFIG_LIBRARIES}
115
 
                       ccs_text_file_interface
116
 
                       compizconfig_ccs_text_file_mock
117
 
                       compizconfig)
118
 
 
119
105
target_link_libraries (compizconfig_test_ccs_upgrade_internal
120
106
                       ${GTEST_BOTH_LIBRARIES}
121
107
                       ${GMOCK_LIBRARY}
122
108
                       ${GMOCK_MAIN_LIBRARY}
123
109
                       ${CMAKE_THREAD_LIBS_INIT}
124
 
                       ccs_settings_upgrade_internal
125
 
                       compizconfig
126
 
                       compizconfig_ccs_context_mock
127
 
                       compizconfig_ccs_plugin_mock
128
 
                       compizconfig_ccs_setting_mock
 
110
           ccs_settings_upgrade_internal
129
111
)
130
112
 
131
113
compiz_discover_tests (compizconfig_test_ccs_object COVERAGE compizconfig)
133
115
compiz_discover_tests (compizconfig_test_ccs_plugin COVERAGE compizconfig_ccs_plugin_mock)
134
116
compiz_discover_tests (compizconfig_test_ccs_setting COVERAGE compizconfig_ccs_setting_mock)
135
117
compiz_discover_tests (compizconfig_test_ccs_mock_backend_conformance COVERAGE compizconfig_ccs_backend_mock)
136
 
compiz_discover_tests (compizconfig_test_ccs_text_file COVERAGE ccs_text_file_interface compizconfig_ccs_text_file_mock)
137
118
compiz_discover_tests (compizconfig_test_ccs_upgrade_internal COVERAGE ccs_settings_upgrade_internal)