From 01a62b850a76916dae66f7f52e1d1e515584e7ce Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周四, 07 8月 2014 23:27:40 +0800
Subject: [PATCH] added boost

---
 CMakeLists.txt |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c0e7c4..6dd24a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,17 +12,19 @@
 SET(CMAKE_DISABLE_SOURCE_CHANGES OFF)
 SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
-project (license++ C CXX)
 SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "CMake verbose" FORCE)
 
+project (license++ C CXX)
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/modules/")
+
 if(WIN32)
 	SET(PLATFORM_LIBS "")
 	if(CMAKE_CL_64)
 		SET(CMAKE_EXE_LINKER_FLAGS "/machine:X64 /INCREMENTAL:NO" CACHE STRING "Linker flags")
 	endif(CMAKE_CL_64)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib ) #${CMAKE_FIND_LIBRARY_SUFFIXES}
-	set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG _CRT_SECURE_NO_WARNINGS)
+	add_definitions("/D_CRT_SECURE_NO_WARNINGS")
 else(WIN32)
     SET(PLATFORM_LIBS "m")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -fmessage-length=0 -std=c++11 -Wall -Wuninitialized -fPIC") 
@@ -36,6 +38,7 @@
 	ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif(WIN32)
 
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(HAVE_64BIT_SIZE_T 1)
 else(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -43,26 +46,44 @@
 endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
 set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
 
+#TODO: determine target arch.
+SET( TargetArchitecture "X86_64")
+SET(Boost_USE_STATIC_LIBS ON)
+include(add_boost)
+set(Boost_FOUND TRUE)
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories ( ${Boost_LIBRARY_DIRS} )
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/modules/")
+#get_cmake_property(_variableNames VARIABLES)
+#foreach (_variableName ${_variableNames})
+#    message(STATUS "${_variableName}=${${_variableName}}")
+#endforeach()
+#include_directories(${Boost_INCLUDE_DIRS})
+#link_directories ( ${Boost_LIBRARY_DIRS} )
+
 #find_package(CryptoPP REQUIRED)
 #include_directories(${CRYPTOPP_INCLUDE_DIRS})
 #link_directories ( ${Boost_LIBRARY_DIRS} )
 
 
-
-SET(Boost_USE_STATIC_LIBS ON)
 # static runtime requires /MT 
 #SET(Boost_USE_MULTITHREADED ON) #SET(Boost_USE_STATIC_RUNTIME OFF)
 #find_package(Boost COMPONENTS thread date_time program_options filesystem system regex unit_test_framework)
-find_package(Boost COMPONENTS date_time program_options filesystem system unit_test_framework)
+#find_package(Boost COMPONENTS date_time program_options filesystem system unit_test_framework)
 #include_directories(${Boost_INCLUDE_DIRS})
 #link_directories ( ${Boost_LIBRARY_DIRS} )
 
-#find a static version of openssl crypto library
-find_package(OpenSSL REQUIRED)
-include_directories(${OPENSSL_INCLUDE_DIR})
-list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
+
+if(NOT WIN32)	
+	#find a static version of openssl crypto library
+	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})
+endif(NOT WIN32)
 
 FIND_PACKAGE(Doxygen)
 
@@ -100,7 +121,6 @@
 #include build directory to find build_properties.h
 include_directories(${CMAKE_BINARY_DIR})
 
-
 add_subdirectory(src)
 
 #test are done with boost_tests:disable them if boost not found.
@@ -115,8 +135,6 @@
 ENDIF(Boost_FOUND)
 
 #include(build/modules/CmakeDebugVariables.txt)
-
-
 
 message("")
 message( STATUS "C compiler: " ${CMAKE_C_COMPILER})

--
Gitblit v1.9.1