diff options
Diffstat (limited to 'cmake')
| -rw-r--r--[-rwxr-xr-x] | cmake/CommonAPI.cmake | 9 | ||||
| -rw-r--r-- | cmake/FindDBUS.cmake | 46 |
2 files changed, 5 insertions, 50 deletions
diff --git a/cmake/CommonAPI.cmake b/cmake/CommonAPI.cmake index 45c1078..a97d75c 100755..100644 --- a/cmake/CommonAPI.cmake +++ b/cmake/CommonAPI.cmake @@ -46,7 +46,7 @@ MACRO(LOAD_COMMONAPI) IF(${COMMONAPI_USED_BINDING} EQUAL 1) IF(NOT CommonAPI-SomeIP_FOUND) FIND_PACKAGE (vsomeip REQUIRED) - FIND_PACKAGE(CommonAPI-SomeIP REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY) + FIND_PACKAGE(CommonAPI-SomeIP REQUIRED) FIND_LIBRARY(CommonAPI-SomeIP_LIBRARY REQUIRED NAMES CommonAPI-SomeIP @@ -54,6 +54,7 @@ MACRO(LOAD_COMMONAPI) "/usr/local/lib" "/usr/lib" ) + ENDIF(NOT CommonAPI-SomeIP_FOUND) message(STATUS "CommonAPI-SomeIP Version: ${CommonAPI-SomeIP_VERSION}") @@ -62,8 +63,8 @@ MACRO(LOAD_COMMONAPI) ELSE() SET(COMMONAPI_USED_BINDING 0 CACHE INTERNAL "hide this!" FORCE) IF(NOT CommonAPI-DBus_FOUND) - FIND_PACKAGE(DBUS REQUIRED) - FIND_PACKAGE(CommonAPI-DBus REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY) + pkg_check_modules (DBUS "dbus-1 >= 1.4" REQUIRED) + FIND_PACKAGE(CommonAPI-DBus REQUIRED) FIND_LIBRARY(CommonAPI-DBus_LIBRARY REQUIRED NAMES CommonAPI-DBus @@ -235,7 +236,7 @@ ENDMACRO(EXECUTE_GENERATOR) # FIDLS_BINDING a list with fidls for the binding generator. # DESTINATION a relative path to the build directory or an absolute path. # ALT_DESTINATION an alternative relative/absolute path with common-api sources, usually in the source tree. -FUNCTION(COMMON_API_GENERATE_SOUCRES) +FUNCTION(COMMON_API_GENERATE_SOURCES) #parse the input parameters set(options "") set(oneValueArgs TARGET DESTINATION ALT_DESTINATION HEADER_TEMPLATE) diff --git a/cmake/FindDBUS.cmake b/cmake/FindDBUS.cmake deleted file mode 100644 index a6eaae3..0000000 --- a/cmake/FindDBUS.cmake +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################ -# -# Copyright 2010, 2011 BMW Car IT GmbH -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################ - -FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h - PATHS "/usr/include/dbus-1.0") - -FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h -PATHS "/usr/lib/dbus-1.0/include" - "/usr/lib/*/dbus-1.0/include" -) - -FIND_LIBRARY(DBUS_LIBRARY -NAMES dbus-1 -PATHS "/usr/lib" -) - -SET( DBUS_FOUND "NO" ) -IF(DBUS_LIBRARY) - SET( DBUS_FOUND "YES" ) - message(STATUS "Found DBUS libs: ${DBUS_LIBRARY}") - message(STATUS "Found DBUS include: ${DBUS_INCLUDE_DIR}") - message(STATUS "Found DBUS arch dependent include: ${DBUS_ARCH_INCLUDE_DIR}") -ENDIF(DBUS_LIBRARY) - -MARK_AS_ADVANCED( - DBUS_INCLUDE_DIR - DBUS_ARCH_INCLUDE_DIR - DBUS_LIBRARY -) - |