From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001 From: nancy.liao <huihui.liao@greentest.com.cn> Date: ćšć, 29 5æ 2025 18:14:38 +0800 Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop --- src/templates/licensecc_properties_test.h.in | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/templates/licensecc_properties_test.h.in b/src/templates/licensecc_properties_test.h.in index 071b788..3d05d82 100644 --- a/src/templates/licensecc_properties_test.h.in +++ b/src/templates/licensecc_properties_test.h.in @@ -3,12 +3,13 @@ //Build locations and parameters for tests #define PROJECT_BINARY_DIR "@CMAKE_BINARY_DIR@" -#define PROJECT_SRC_DIR "@CMAKE_CURRENT_LIST_DIR@" +#define PROJECT_SRC_DIR "@CMAKE_CURRENT_LIST_DIR@/../src" #define PROJECT_BASE_DIR "@CMAKE_SOURCE_DIR@" -#define PROJECT_TEST_SRC_DIR "@CMAKE_SOURCE_DIR@/test" +//this file is customized in test folder +#define PROJECT_TEST_SRC_DIR "@CMAKE_CURRENT_LIST_DIR@" #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" @@ -19,7 +20,7 @@ * command line parameters */ #define PARAM_BASE64 "base64" -#define PARAM_LICENSE_NAME "license-name" +#define PARAM_LICENSE_OUTPUT "output-file-name" #define PARAM_PRODUCT_NAME "product-name" #define PARAM_PROJECT_FOLDER "project-folder" #define PARAM_PRIMARY_KEY "primary-key" -- Gitblit v1.9.1