From efb88c43282aa4af665e19cc29762c6abc26e47d Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 22 3月 2020 12:03:20 +0800
Subject: [PATCH] rename lcc -> lccgen inspector->lccinspector
---
extern/license-generator | 2 +-
cmake/Findlccgen.cmake | 26 +++++++++++++-------------
src/templates/licensecc_properties_test.h.in | 2 +-
src/inspector/CMakeLists.txt | 4 ++--
CMakeLists.txt | 6 +++---
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d401573..a98149f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
@@ -109,7 +109,7 @@
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}"
+ 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}"
USES_TERMINAL
)
diff --git a/cmake/Findlccgen.cmake b/cmake/Findlccgen.cmake
index bc994eb..0e11f1d 100644
--- a/cmake/Findlccgen.cmake
+++ b/cmake/Findlccgen.cmake
@@ -11,8 +11,8 @@
#
#This module provides the following imported targets, if found:
#
-#``license_generator::lcc``
-# The lcc executable
+#``license_generator::lccgen``
+# The lccgen executable
#
#If lcc is not found this module will try to download it as a submodule
#Git must be installed.
@@ -41,28 +41,28 @@
#
#]=======================================================================]
-set(lcc_names lcc lcc.exe)
+set(lcc_names lccgen lccgen.exe)
set (failure_messge "Error finding lcc executable.")
find_package(PkgConfig)
if(LCC_LOCATION)
- find_package(lcc HINTS ${LCC_LOCATION} CONFIG) #try to find it without looping on this module
+ find_package(lccgen HINTS ${LCC_LOCATION} CONFIG) #try to find it without looping on this module
if(NOT lcc_FOUND)
find_program(LCC_EXECUTABLE
- NAMES ${lcc_names} HINTS ${LCC_LOCATION} DOC "lcc command line client")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(lcc FOUND_VAR LCC_FOUND
+ NAMES ${lcc_names} HINTS ${LCC_LOCATION} DOC "lccgen command line client")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(lccgen FOUND_VAR LCC_FOUND
REQUIRED_VARS LCC_EXECUTABLE
FAIL_MESSAGE "Error finding lcc executable. variable LCC_LOCATION non set correctly.")
- add_executable(license_generator::lcc IMPORTED GLOBAL)
- set_property(TARGET license_generator::lcc PROPERTY IMPORTED_LOCATION ${LCC_EXECUTABLE})
+ add_executable(license_generator::lccgen IMPORTED GLOBAL)
+ set_property(TARGET license_generator::lccgen PROPERTY IMPORTED_LOCATION ${LCC_EXECUTABLE})
ENDIF(NOT lcc_FOUND)
ELSE(LCC_LOCATION)
- find_package(lcc HINTS ${CMAKE_BINARY_DIR} CONFIG) #try to find it without looping on this module
+ find_package(lccgen HINTS ${CMAKE_BINARY_DIR} CONFIG) #try to find it without looping on this module
- IF(NOT lcc_FOUND)
+ IF(NOT lccgen_FOUND)
find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
- # Update submodules as needed
+ # Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE)
message(STATUS "Submodule update")
@@ -78,8 +78,8 @@
set(failure_messge "All the options to find lcc executable failed. And i can't compile one from source GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
endif()
add_subdirectory("${PROJECT_SOURCE_DIR}/extern/license-generator")
- set(lcc_FOUND TRUE)
- ENDIF(NOT lcc_FOUND)
+ set(lccgen_FOUND TRUE)
+ ENDIF(NOT lccgen_FOUND)
ENDIF(LCC_LOCATION)
diff --git a/extern/license-generator b/extern/license-generator
index 61acc7d..5416f96 160000
--- a/extern/license-generator
+++ b/extern/license-generator
@@ -1 +1 @@
-Subproject commit 61acc7dee39b9947e08d0753d2f69d2a41d5fe31
+Subproject commit 5416f96a00ec5769b69746836ca39b60fbb9d62a
diff --git a/src/inspector/CMakeLists.txt b/src/inspector/CMakeLists.txt
index c8ff618..e3e5a83 100644
--- a/src/inspector/CMakeLists.txt
+++ b/src/inspector/CMakeLists.txt
@@ -1,7 +1,7 @@
-ADD_EXECUTABLE(inspector inspector.cpp )
+ADD_EXECUTABLE(lccinspector inspector.cpp )
-target_link_libraries(inspector
+target_link_libraries(lccinspector
licensecc_static
Boost::unit_test_framework
Boost::filesystem
diff --git a/src/templates/licensecc_properties_test.h.in b/src/templates/licensecc_properties_test.h.in
index 69cf35d..c7635d4 100644
--- a/src/templates/licensecc_properties_test.h.in
+++ b/src/templates/licensecc_properties_test.h.in
@@ -8,7 +8,7 @@
#define PROJECT_TEST_SRC_DIR "@CMAKE_SOURCE_DIR@/test"
#define PROJECT_TEST_TEMP_DIR "@CMAKE_BINARY_DIR@/Testing/Temporary"
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
-#define LCC_EXE "$<TARGET_FILE:license_generator::lcc>"
+#define LCC_EXE "$<TARGET_FILE:license_generator::lccgen>"
#define LCC_TEST_LICENSES_PROJECT "@CMAKE_BINARY_DIR@/Testing/Temporary/@LCC_PROJECT_NAME@"
#define LCC_LICENSES_BASE LCC_TEST_LICENSES_PROJECT "/licenses"
--
Gitblit v1.9.1