From f4e683fc6bd6ac76f9979f49d737588b6ddf16b0 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 11月 2020 22:13:13 +0800 Subject: [PATCH] windows smbios --- CMakeLists.txt | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d401573..b85bc2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON) IF(NOT LCC_PROJECT_NAME) - message(WARNING "You should define a variable LCC_PROJECT_NAME containing the name of the software you want to add a license to." - "A mock product named DEFAULT has been added for you.") + message(STATUS "You should define a variable LCC_PROJECT_NAME containing the name of the software you want to add a license to." + "A mock project named DEFAULT has been added for you.") set(LCC_PROJECT_NAME "DEFAULT" CACHE STRING "Project name (name of the software for which you want to issue a license)") ENDIF(NOT LCC_PROJECT_NAME) @@ -27,8 +27,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") -#find lcc executable or build it. -find_package(lcc REQUIRED) +#find lccgen executable or build it. +find_package(lccgen REQUIRED) #In case the build system doesn't support binfmt misc IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" ) AND CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR ) @@ -65,7 +65,7 @@ IF(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2) SET ( ZLIB_USE_STATIC_LIBS ON ) find_package(ZLIB REQUIRED) - list(APPEND EXTERNAL_LIBS ${ZLIB_LIBRARIES}) + list(APPEND EXTERNAL_LIBS "${ZLIB_LIBRARIES}") MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION_STRING} - licensecc") ELSE(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2) MESSAGE(STATUS "openssl ${OPENSSL_VERSION} zlib not required - licensecc") @@ -73,7 +73,9 @@ find_program( MEMORYCHECK_COMMAND valgrind ) set( MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" ) - set(main_lib_dest "lib/${PROJECT_NAME}") + set(main_lib_dest "lib/${PROJECT_NAME}") + #https://cmake.org/cmake/help/latest/command/find_package.html + set(pkg_config_dest "lib/cmake/${PROJECT_NAME}") else(UNIX) IF(NOT OPENSSL_FOUND) MESSAGE(STATUS "Openssl not found, configuring the library without it (running in wine not supported).") @@ -99,6 +101,8 @@ endif(MINGW) endif(MSVC) set(main_lib_dest "${PROJECT_NAME}") + #https://cmake.org/cmake/help/latest/command/find_package.html + set(pkg_config_dest "cmake/${PROJECT_NAME}") endif(UNIX) #initialize project @@ -107,14 +111,13 @@ set(LCC_PROJECT_PUBLIC_KEY "${LCC_INCLUDE_DIR}/public_key.h" ) set(LCC_PROJECT_PRIVATE_KEY "${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME}/private_key.rsa" ) -add_custom_command( - OUTPUT "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}" - COMMAND license_generator::lcc project initialize -t "${PROJECT_SOURCE_DIR}/src/templates" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}" - COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}" +add_custom_target(project_initialize + COMMAND license_generator::lccgen project initialize -t "${PROJECT_SOURCE_DIR}/src/templates" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}" + COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY} and ${LCC_PROJECT_PRIVATE_KEY} if they don't already exist" USES_TERMINAL ) + include_directories( ${LCC_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/include" ) -add_custom_target(project_initialize DEPENDS "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}") message( STATUS "CXX compiler : " ${CMAKE_CXX_COMPILER}) message( STATUS "CXX compiler flags : " ${CMAKE_CXX_FLAGS}) @@ -187,14 +190,12 @@ ELSE(Doxygen_FOUND AND Sphinx_FOUND) message(STATUS "Doxygen or Sphynx not found, not generating docs.") ENDIF(Doxygen_FOUND AND Sphinx_FOUND) - - install(DIRECTORY ${LCC_INCLUDE_DIR} DESTINATION include/${PROJECT_NAME}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) -install(FILES src/cmake/licensecc-config.cmake DESTINATION ${main_lib_dest}) +install(FILES src/cmake/licensecc-config.cmake DESTINATION ${pkg_config_dest}) include(CMakePackageConfigHelpers) write_basic_package_version_file(${CMAKE_BINARY_DIR}/licensecc-config-version.cmake COMPATIBILITY SameMajorVersion) -install(FILES ${CMAKE_BINARY_DIR}/licensecc-config-version.cmake DESTINATION ${main_lib_dest}) +install(FILES ${CMAKE_BINARY_DIR}/licensecc-config-version.cmake DESTINATION ${pkg_config_dest}) -- Gitblit v1.9.1