Maximilien Siavelis
2018-01-05 b446e4d14a0694d23573d77672ef6d70c51d6a08
make install and some cleanup
11个文件已修改
2 文件已重命名
16个文件已删除
3787 ■■■■■ 已修改文件
.gitignore 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CMakeLists.txt 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
build/linux/.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
build/modules/CmakeDebugVariables.txt 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
build/modules/FindCryptoPP.cmake 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
build/modules/FindDbus.cmake 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
build/win/README.txt 补丁 | 查看 | 原始文档 | blame | 历史
doc/Doxyfile.in 1904 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
doc/footer.html 补丁 | 查看 | 原始文档 | blame | 历史
doc/header.html 补丁 | 查看 | 原始文档 | blame | 历史
modules/target_arch.cmake 补丁 | 查看 | 原始文档 | blame | 历史
modules/utilities.cmake 补丁 | 查看 | 原始文档 | blame | 历史
src/library/CMakeLists.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/library/base/CMakeLists.txt 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/library/os/linux/CMakeLists.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/library/os/win/CMakeLists.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/scratch/linux/LicenseSigner_linux.cpp 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/scratch/linux/bootstrap_linux.cpp 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/scratch/linux/os-linux.cpp 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/scratch/win/Copy of Main.cpp 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/scratch/win/LicenseSigner.cpp 306 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/tools/base_lib/CMakeLists.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/tools/license-generator/CMakeLists.txt 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/functional/CMakeLists.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/library/CMakeLists.txt 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/license-generator/CMakeLists.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/scratch/base62.c 131 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/scratch/pc-identifiers.c 415 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/scratch/stackoverflow.cpp 187 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -13,3 +13,7 @@
*.a
/Makefile
/Testing
# Cmake generated files
build
CMakeLists.txt
@@ -1,5 +1,4 @@
#TODO guess address_model 64 in boost
#make it compatible with find_boost (exchange lowercase to camelcase)
#fix shared libraries activation
#cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
@@ -19,7 +18,7 @@
project (license++ C CXX)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/modules/")
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules/")
include(utilities)
if(CMAKE_BUILD_TYPE)
@@ -101,35 +100,6 @@
    list(APPEND EXTERNAL_LIBS dl)
endif(NOT MSVC)
FIND_PACKAGE(Doxygen)
IF (DOXYGEN_FOUND)
    SET(DOXYGEN_INPUT ${CMAKE_BINARY_DIR}/doc/Doxyfile)
    SET(DOXYGEN_OUTPUT ${CMAKE_BINARY_DIR}/doc/doxy_output)
    configure_file (
      "doc/Doxyfile.in"
      "doc/Doxyfile"
    )
    ADD_CUSTOM_COMMAND(
      OUTPUT ${DOXYGEN_OUTPUT}
      COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
      COMMAND ${CMAKE_COMMAND} -E echo "Done."
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
      DEPENDS ${DOXYGEN_INPUT})
    ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${DOXYGEN_OUTPUT})
    ADD_CUSTOM_TARGET(apidoc_forced
      COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
      COMMAND ${CMAKE_COMMAND} -E echo "Done."
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
ENDIF (DOXYGEN_FOUND)
configure_file (
    "src/build_properties.h.in" 
    "${CMAKE_BINARY_DIR}/build_properties.h"
@@ -147,7 +117,6 @@
ENDIF(BUILD_TESTING)
add_subdirectory(test)
#include(build/modules/CmakeDebugVariables.txt)
message( STATUS "C compiler: " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags: " ${CMAKE_C_FLAGS})
message( STATUS "CXX compiler: " ${CMAKE_CXX_COMPILER})
build/linux/.gitignore
File was deleted
build/modules/CmakeDebugVariables.txt
File was deleted
build/modules/FindCryptoPP.cmake
File was deleted
build/modules/FindDbus.cmake
File was deleted
build/win/README.txt
doc/Doxyfile.in
File was deleted
doc/footer.html
doc/header.html
modules/target_arch.cmake
modules/utilities.cmake
src/library/CMakeLists.txt
@@ -18,3 +18,7 @@
     os
)
install(TARGETS license++_static ARCHIVE DESTINATION lib)
install(FILES api/datatypes.h api/license++.h DESTINATION include/api)
install(FILES base/base.h DESTINATION include/base)
install(FILES pc-identifiers.h DESTINATION include/)
src/library/base/CMakeLists.txt
@@ -4,4 +4,6 @@
    logger.c
)
add_dependencies( base public_key )
add_dependencies( base public_key )
install(TARGETS base ARCHIVE DESTINATION lib)
src/library/os/linux/CMakeLists.txt
@@ -8,3 +8,5 @@
     base
     ${EXTERNAL_LIBS}
)
install(TARGETS os ARCHIVE DESTINATION lib)
src/library/os/win/CMakeLists.txt
@@ -7,3 +7,5 @@
     base
     ${EXTERNAL_LIBS}
)
install(TARGETS os ARCHIVE DESTINATION lib)
src/scratch/linux/LicenseSigner_linux.cpp
File was deleted
src/scratch/linux/bootstrap_linux.cpp
File was deleted
src/scratch/linux/os-linux.cpp
File was deleted
src/scratch/win/Copy of Main.cpp
File was deleted
src/scratch/win/LicenseSigner.cpp
File was deleted
src/tools/base_lib/CMakeLists.txt
@@ -17,3 +17,5 @@
     tools_base
     ${EXTERNAL_LIBS}
)
install(TARGETS tools_base ARCHIVE DESTINATION lib)
src/tools/license-generator/CMakeLists.txt
@@ -31,5 +31,7 @@
)
add_dependencies( license_generator private_key )
install(TARGETS license_generator RUNTIME DESTINATION bin)
#SET_TARGET_PROPERTIES(license_generator PROPERTIES LINK_SEARCH_START_STATIC ON)
#SET_TARGET_PROPERTIES(license_generator PROPERTIES LINK_SEARCH_END_STATIC ON)
#SET_TARGET_PROPERTIES(license_generator PROPERTIES LINK_SEARCH_END_STATIC ON)
test/functional/CMakeLists.txt
@@ -54,3 +54,4 @@
ADD_TEST(date_test ${EXECUTABLE_OUTPUT_PATH}/date_test)
ADD_TEST(volid_test ${EXECUTABLE_OUTPUT_PATH}/volid_test)
install(TARGETS standard_license_test date_test volid_test RUNTIME DESTINATION bin)
test/library/CMakeLists.txt
@@ -32,4 +32,6 @@
    #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)
ENDIF(WIN32)
install(TARGETS license_reader_test RUNTIME DESTINATION bin)
test/license-generator/CMakeLists.txt
@@ -13,3 +13,5 @@
#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)
install(TARGETS license_generator_test RUNTIME DESTINATION bin)
test/scratch/base62.c
File was deleted
test/scratch/pc-identifiers.c
File was deleted
test/scratch/stackoverflow.cpp
File was deleted