From d5cfca5d6eae5fdc99f04e50c19b12e1803ca90b Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: ćšć, 16 10æ 2014 02:55:25 +0800
Subject: [PATCH] optional dbus
---
CMakeLists.txt | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ba51db..c54b301 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
#fix shared libraries activation
#cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
#version variables, major and minor must be 1 character only
SET(LICENSECC_MAJOR_VERSION 1)
@@ -81,10 +81,13 @@
find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
- FIND_PACKAGE(Dbus REQUIRED)
- include_directories(${DBUS_INCLUDE_DIR})
- include_directories(${DBUS_ARCH_INCLUDE_DIR})
- list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
+ if(USE_DBUS_IDENTIFIER)
+ FIND_PACKAGE(Dbus REQUIRED)
+ add_definitions(-DUSE_DBUS)
+ include_directories(${DBUS_INCLUDE_DIR})
+ include_directories(${DBUS_ARCH_INCLUDE_DIR})
+ list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
+ endif(USE_DBUS_IDENTIFIER)
list(APPEND EXTERNAL_LIBS dl)
endif(NOT WIN32)
@@ -139,6 +142,8 @@
message("")
message( STATUS "C compiler: " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags: " ${CMAKE_C_FLAGS})
+message( STATUS "CXX compiler: " ${CMAKE_CXX_COMPILER})
+message( STATUS "CXX compiler flags: " ${CMAKE_CXX_FLAGS})
if(CMAKE_BUILD_TYPE)
message( STATUS "Build type: " ${CMAKE_BUILD_TYPE})
endif(CMAKE_BUILD_TYPE)
--
Gitblit v1.9.1