From: Kevron Rees Date: Fri, 15 Aug 2014 16:42:42 +0000 (-0700) Subject: version bump 0.11.812 X-Git-Tag: 0.12.903~130 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aae2cacff1ddaa7560b80834b88de68b311088b4;p=profile%2Fivi%2Fautomotive-message-broker.git version bump 0.11.812 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 82c2fea..7721303 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_BUILD_TYPE, Debug) include(FindPkgConfig) set(PROJECT_NAME "automotive-message-broker") -set(PROJECT_VERSION "0.11.811") +set(PROJECT_VERSION "0.11.812") set(PROJECT_CODENAME "veyron") set(PROJECT_QUALITY "alpha") @@ -66,10 +66,10 @@ if(enable_docs) message(STATUS "doxygen doc generation enabled") find_package(Doxygen) if(DOXYGEN_FOUND) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.idl.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.idl @ONLY) - add_custom_target(all ALL ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs/amb COMMENT "Generating API documentation with Doxygen" VERBATIM) - add_custom_target(idl ALL ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.idl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs/dbus COMMENT "Generating DBus API documentation with Doxygen" VERBATIM) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.idl.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.idl @ONLY) + add_custom_target(all ALL ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs/amb COMMENT "Generating API documentation with Doxygen" VERBATIM) + add_custom_target(idl ALL ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.idl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs/dbus COMMENT "Generating DBus API documentation with Doxygen" VERBATIM) endif(DOXYGEN_FOUND) endif(enable_docs) @@ -94,30 +94,30 @@ set(include_dirs ${libtool_INCLUDE_DIR} ${glib_INCLUDE_DIRS} ${gio_INCLUDE_DIRS} set(link_libraries -lamb ${libtool_LIBRARY} ${glib_LIBRARIES} ${json_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib) if(qtmainloop) - message(STATUS "using Qt mainloop") - - find_package(Qt5Core) - if(Qt5Core_FOUND) - message(STATUS "using Qt5") - set(QT_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS}) - set(QT_LIBRARIES ${Qt5Core_LIBRARIES}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - # if(CMAKE_SIZEOF_VOID_P MATCHES "8") - # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcmodel=large") - # endif(CMAKE_SIZEOF_VOID_P MATCHES "8") - add_definitions(${Qt5Core_DEFINITIONS}) - else(Qt5Core_FOUND) - message(STATUS "using Qt4") - find_package( Qt4 REQUIRED ) - include(${QT_USE_FILE}) - - endif(Qt5Core_FOUND) - - set(include_dirs ${include_dirs} ${QT_INCLUDE_DIRS}) - set(link_libraries ${link_libraries} ${QT_LIBRARIES}) - - add_definitions(-DQT_NO_KEYWORDS) - add_definitions(-DUSE_QT_CORE) + message(STATUS "using Qt mainloop") + + find_package(Qt5Core) + if(Qt5Core_FOUND) + message(STATUS "using Qt5") + set(QT_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS}) + set(QT_LIBRARIES ${Qt5Core_LIBRARIES}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") + # if(CMAKE_SIZEOF_VOID_P MATCHES "8") + # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcmodel=large") + # endif(CMAKE_SIZEOF_VOID_P MATCHES "8") + add_definitions(${Qt5Core_DEFINITIONS}) + else(Qt5Core_FOUND) + message(STATUS "using Qt4") + find_package( Qt4 REQUIRED ) + include(${QT_USE_FILE}) + + endif(Qt5Core_FOUND) + + set(include_dirs ${include_dirs} ${QT_INCLUDE_DIRS}) + set(link_libraries ${link_libraries} ${QT_LIBRARIES}) + + add_definitions(-DQT_NO_KEYWORDS) + add_definitions(-DUSE_QT_CORE) endif(qtmainloop) if(usebluez5)