diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-01-31 11:46:08 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-01-31 11:46:08 +0000 |
| commit | 089df7ae2d97966b789231e112709183483c64eb (patch) | |
| tree | 0d8f4a2a9e99f61c5d7946653e7dd9eb3aac66d0 /panel-gnome | |
| parent | cbb15a8fefaf70b03434b055cf41185c4009fb10 (diff) | |
| parent | 271b0fbf8b14a4f7a8f47de0e3a8751bd50676c3 (diff) | |
| download | ayatana-indicator-datetime-089df7ae2d97966b789231e112709183483c64eb.tar.gz ayatana-indicator-datetime-089df7ae2d97966b789231e112709183483c64eb.tar.bz2 ayatana-indicator-datetime-089df7ae2d97966b789231e112709183483c64eb.zip | |
Finally land this. Other, still open bugs will be fixed in subsequent commits. Fixes: 793450, 1271484, 1274046
Diffstat (limited to 'panel-gnome')
| -rw-r--r-- | panel-gnome/CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/panel-gnome/CMakeLists.txt b/panel-gnome/CMakeLists.txt index 9be4cf5..82c511d 100644 --- a/panel-gnome/CMakeLists.txt +++ b/panel-gnome/CMakeLists.txt @@ -2,16 +2,20 @@ set (PANEL_LIB "gnome-indicator-datetime") add_definitions (-DPKGDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}") + +SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -g") +SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS}") + add_library (${PANEL_LIB} SHARED ${CMAKE_SOURCE_DIR}/panel/datetime-prefs.c ${CMAKE_SOURCE_DIR}/panel/datetime-prefs-locations.c ${CMAKE_SOURCE_DIR}/panel/datetime-prefs-locations.h ${CMAKE_SOURCE_DIR}/src/utils.c - ${CMAKE_SOURCE_DIR}/src/utils.h - ${CMAKE_SOURCE_DIR}/src/settings-shared.h) + ${CMAKE_SOURCE_DIR}/include/datetime/utils.h + ${CMAKE_SOURCE_DIR}/include/datetime/settings-shared.h) set_property (TARGET ${PANEL_LIB} PROPERTY OUTPUT_NAME indicator-datetime) -include_directories (${PANEL_DEPS_INCLUDE_DIRS}) +include_directories (SYSTEM ${PANEL_DEPS_INCLUDE_DIRS}) link_directories (${PANEL_DEPS_LIBRARY_DIRS}) |