From ef84976d556bc5ff20040f1e11980798cf7815e9 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周五, 08 8月 2014 15:34:25 +0800
Subject: [PATCH] build linux
---
test/library/CMakeLists.txt | 15 +++----
src/license-generator/win/LicenseSigner.cpp | 0
src/license-generator/linux/LicenseSigner.cpp | 0
build/linux/.gitignore | 14 ------
test/license-generator/CMakeLists.txt | 1
src/license-generator/CMakeLists.txt | 10 ++++-
CMakeLists.txt | 36 ++++--------------
7 files changed, 25 insertions(+), 51 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dd24a0..e9e4051 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,28 +50,10 @@
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} )
-
-#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} )
-
-
# 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)
-#include_directories(${Boost_INCLUDE_DIRS})
-#link_directories ( ${Boost_LIBRARY_DIRS} )
if(NOT WIN32)
@@ -123,16 +105,14 @@
add_subdirectory(src)
-#test are done with boost_tests:disable them if boost not found.
-IF(Boost_FOUND)
- ENABLE_TESTING()
- INCLUDE(CTest)
- IF(BUILD_TESTING)
- SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
- MARK_AS_ADVANCED(BUILDNAME)
- ENDIF(BUILD_TESTING)
- add_subdirectory(test)
-ENDIF(Boost_FOUND)
+ENABLE_TESTING()
+INCLUDE(CTest)
+IF(BUILD_TESTING)
+ SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
+ MARK_AS_ADVANCED(BUILDNAME)
+ENDIF(BUILD_TESTING)
+add_subdirectory(test)
+
#include(build/modules/CmakeDebugVariables.txt)
diff --git a/build/linux/.gitignore b/build/linux/.gitignore
index ba89ff8..22e8364 100644
--- a/build/linux/.gitignore
+++ b/build/linux/.gitignore
@@ -1,13 +1 @@
-/CMakeFiles
-/src
-/test
-/Testing
-/CMakeCache.txt
-/DartConfiguration.tcl
-/lib
-/cmake_install.cmake
-/CTestTestfile.cmake
-/Makefile
-/doc
-/nohup.out
-/build_properties.h
+/*
\ No newline at end of file
diff --git a/src/license-generator/CMakeLists.txt b/src/license-generator/CMakeLists.txt
index 1397d11..03bc24f 100644
--- a/src/license-generator/CMakeLists.txt
+++ b/src/license-generator/CMakeLists.txt
@@ -1,9 +1,15 @@
-
+if(WIN32)
ADD_LIBRARY(license_generator_lib STATIC
license-generator.cpp
- LicenseSigner.cpp
+ win/LicenseSigner.cpp
)
+else()
+ADD_LIBRARY(license_generator_lib STATIC
+ license-generator.cpp
+ linux/LicenseSigner.cpp
+)
+endif()
link_directories ( ${Boost_LIBRARY_DIRS} )
add_dependencies( license_generator_lib boost_filesystem private_key )
diff --git a/src/license-generator/LicenseSigner.cpp b/src/license-generator/linux/LicenseSigner.cpp
similarity index 100%
copy from src/license-generator/LicenseSigner.cpp
copy to src/license-generator/linux/LicenseSigner.cpp
diff --git a/src/license-generator/LicenseSigner.cpp b/src/license-generator/win/LicenseSigner.cpp
similarity index 100%
rename from src/license-generator/LicenseSigner.cpp
rename to src/license-generator/win/LicenseSigner.cpp
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index d4067c2..3e7ee93 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,5 +1,3 @@
-link_directories ( ${Boost_LIBRARY_DIRS} )
-
add_executable(
license_reader_test
LicenseReader_test.cpp
@@ -8,15 +6,15 @@
target_link_libraries(
license_reader_test
license++_static
- ${Boost_LIBRARIES}
)
+add_dependencies( license_reader_test boost_test boost_filesystem )
SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
ADD_TEST(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/license_reader_test)
-IF(WIN32)
+#IF(WIN32)
#test windows
-ELSE(WIN32)
+#ELSE(WIN32)
add_executable(
os_linux_test
Os_Linux_test.cpp
@@ -25,9 +23,10 @@
target_link_libraries(
os_linux_test
os
- ${Boost_LIBRARIES}
)
-
+
+ add_dependencies( os_linux_test boost_test )
SET_TARGET_PROPERTIES(os_linux_test PROPERTIES LINK_SEARCH_START_STATIC ON)
ADD_TEST(os_linux_test ${EXECUTABLE_OUTPUT_PATH}/os_linux_test)
-ENDIF(WIN32)
\ No newline at end of file
+
+#ENDIF(WIN32)
\ No newline at end of file
diff --git a/test/license-generator/CMakeLists.txt b/test/license-generator/CMakeLists.txt
index f9c5ae0..8a88e5d 100644
--- a/test/license-generator/CMakeLists.txt
+++ b/test/license-generator/CMakeLists.txt
@@ -9,5 +9,6 @@
license_generator_lib
)
+add_dependencies( license_generator_test boost_test boost_filesystem )
SET_TARGET_PROPERTIES(license_generator_test PROPERTIES LINK_SEARCH_START_STATIC ON)
ADD_TEST(license_generator_test ${EXECUTABLE_OUTPUT_PATH}/license_generator_test)
--
Gitblit v1.9.1