aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-25 11:27:56 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-25 11:27:56 +0100
commit2c843c5bb9dd142eec5660bbc27067c769e0efb8 (patch)
tree80e1c2d96c57764125d2c209d4f6d49f0725396f
parent20d3b8ec4826a83e1bb135dc87293ceb50ed65d4 (diff)
parent463ab0d2b9bcf77b21d0404b84b4c7ae297596de (diff)
downloadayatana-indicator-datetime-2c843c5bb9dd142eec5660bbc27067c769e0efb8.tar.gz
ayatana-indicator-datetime-2c843c5bb9dd142eec5660bbc27067c769e0efb8.tar.bz2
ayatana-indicator-datetime-2c843c5bb9dd142eec5660bbc27067c769e0efb8.zip
Merge branch 'tari01-pr/drop-std-version'
Attributes GH PR #80: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/80
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--tests/CMakeLists.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6132dfc..9cde5fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,9 +57,9 @@ endif()
# add warnings/coverage info on handwritten files
# but not the autogenerated ones...
set_source_files_properties(${SERVICE_CXX_SOURCES}
- PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -std=c++11")
+ PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
set_source_files_properties(${SERVICE_C_SOURCES}
- PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -std=c99")
+ PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
# add the bin dir to our include path so our code can find the generated header files
include_directories (${CMAKE_CURRENT_BINARY_DIR})
@@ -69,6 +69,6 @@ include_directories (${CMAKE_SOURCE_DIR})
link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
add_executable (${SERVICE_EXEC} main.cpp)
-set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -std=c++11")
+set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS})
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${URLDISPATCHER_LIBRARIES})
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 082fd9a..3eb0b8a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
find_package(GMock REQUIRED)
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${COMPILE_FLAGS}")
+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}")
# dbustest
pkg_check_modules(DBUSTEST REQUIRED