← Back to branch summary

~brandontschaefer/unity/move-pointer-barrier-to-xi-1.6.99.1

« back to all changes in this revision

Viewing changes to tests/CMakeLists.txt

  • Committer: Neil Jagdish Patel
  • Date: 2011-06-21 12:10:09 UTC
  • mto: This revision was merged to the branch mainline in revision 1244.
  • Revision ID: neil.patel@canonical.com-20110621121009-9873dchryja8chqw
- Rename unity-share to unity-core
- Fix include paths for UnityCore
- Add in all the code that's meant to be shared, update the plugin to look for that code in
  libunity-core
- Tests are disabled again, will fix in next commit
- Update .pc file to reflect new include path

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/CMakeLists.txt
23
23
     )
24
24
add_definitions (${CFLAGS})
25
25
 
26
 
set (LIBS ${TEST_UNIT_DEPS_LIBRARIES})
 
26
set (LIBS ${TEST_UNIT_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION}")
27
27
link_libraries (${LIBS})
28
28
 
29
29
set (LIB_PATHS ${TEST_UNIT_DEPS_LIBRARY_DIRS})
30
 
link_directories (${LIB_PATHS})
 
30
link_directories (${LIB_PATHS} ${CMAKE_BINARY_DIR}/UnityCore)
31
31
 
32
 
include_directories (. .. ../services ${UNITY_SRC} ${CMAKE_BINARY_DIR})
 
32
include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
33
33
 
34
34
find_program(GLIB_GENMARSHAL glib-genmarshal)
35
35
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/services/panel-marshal.c
88
88
 
89
89
add_executable (test-panel
90
90
                TestPanel.cpp
91
 
                ${UNITY_SRC}/DBusIndicators.cpp
92
 
                ${UNITY_SRC}/DBusIndicators.h
93
91
                ${UNITY_SRC}/GLibWrapper.h
94
92
                ${UNITY_SRC}/GLibWrapper-inl.h
95
93
                ${UNITY_SRC}/GLibWrapper.cpp
105
103
                ${UNITY_SRC}/PanelTitlebarGrabAreaView.cpp
106
104
                ${UNITY_SRC}/PanelTray.cpp
107
105
                ${UNITY_SRC}/PanelTray.h
108
 
                ${UNITY_SRC}/Indicators.cpp
109
 
                ${UNITY_SRC}/Indicators.h
110
 
                ${UNITY_SRC}/Indicator.cpp
111
 
                ${UNITY_SRC}/Indicator.h
112
 
                ${UNITY_SRC}/IndicatorEntry.cpp
113
 
                ${UNITY_SRC}/IndicatorEntry.h
114
106
                ${UNITY_SRC}/Introspectable.cpp
115
107
                ${UNITY_SRC}/Introspectable.h
116
108
                ${UNITY_SRC}/PanelHomeButton.cpp
300
292
add_executable(test-gtest
301
293
               test_timer.cpp
302
294
               test_indicator_entry.cpp
303
 
               ${UNITY_SRC}/IndicatorEntry.h
304
 
               ${UNITY_SRC}/IndicatorEntry.cpp
305
295
               ${UNITY_SRC}/Timer.h
306
296
               ${UNITY_SRC}/Timer.cpp
307
297
               )