Commit 946f47c5 authored by Hans-Christian Ebke's avatar Hans-Christian Ebke

Added cmake option to build license key generators independently of license manager.


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17440 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d7558164
...@@ -123,7 +123,7 @@ bool LicenseManager::authenticate() { ...@@ -123,7 +123,7 @@ bool LicenseManager::authenticate() {
QDir::separator() + "MacOS"+ QDir::separator() + "MacOS"+
QDir::separator() + "OpenFlipper"); QDir::separator() + "OpenFlipper");
#else #else
QFile coreApp(OpenFlipper::Options::applicationDirStr() + QDir::separator() + "bin" + QDir::separator() + "OpenFlipper"); QFile coreApp(OpenFlipper::Options::applicationDirStr() + QDir::separator() + "bin" + QDir::separator() + TOSTRING(PRODUCT_STRING));
#endif #endif
if ( ! coreApp.exists() ) { if ( ! coreApp.exists() ) {
......
...@@ -284,11 +284,7 @@ endmacro () ...@@ -284,11 +284,7 @@ endmacro ()
macro (_plugin_licensemanagement) macro (_plugin_licensemanagement)
acg_append_files (headers "LicenseManager.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager") acg_append_files (headers "LicenseManager.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
if ( OPENFLIPPER_ENABLE_LICENSE_MANAGER ) if ( OPENFLIPPER_ENABLE_LICENSE_KEY_GENERATOR )
acg_append_files (headers "LicenseManagerActive.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
acg_append_files (sources "*.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
# acg_append_files (ui "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
acg_append_files (keygen_hdr "*.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen") acg_append_files (keygen_hdr "*.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
acg_append_files (keygen_src "*.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen") acg_append_files (keygen_src "*.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
acg_append_files (keygen_ui "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen") acg_append_files (keygen_ui "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
...@@ -329,6 +325,11 @@ macro (_plugin_licensemanagement) ...@@ -329,6 +325,11 @@ macro (_plugin_licensemanagement)
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/LicenseManagement" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/LicenseManagement"
) )
endif () endif ()
endif()
if ( OPENFLIPPER_ENABLE_LICENSE_MANAGER )
acg_append_files (headers "LicenseManagerActive.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
acg_append_files (sources "*.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
# acg_append_files (ui "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
else(OPENFLIPPER_ENABLE_LICENSE_MANAGER) else(OPENFLIPPER_ENABLE_LICENSE_MANAGER)
acg_append_files (headers "LicenseManagerDisabled.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager") acg_append_files (headers "LicenseManagerDisabled.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment