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

CMakeLists.txt

@@ -203,6 +203,10 @@ if ( NOT DEFINED OPENFLIPPER_ENABLE_LICENSE_MANAGER )
   set( OPENFLIPPER_ENABLE_LICENSE_MANAGER true CACHE BOOL "Enable or disable license management in all plugins" )
 endif()
 
+if ( NOT DEFINED OPENFLIPPER_ENABLE_LICENSE_KEY_GENERATOR )
+  set( OPENFLIPPER_ENABLE_LICENSE_KEY_GENERATOR true CACHE BOOL "Enable or disable building the license key generators in all plugins" )
+endif()
+
 # ========================================================================
 # Apple Mac Store Flags
 # ========================================================================

OpenFlipper/LicenseManager/LicenseManagerActive.cc

@@ -123,7 +123,7 @@ bool LicenseManager::authenticate() {
                                                               QDir::separator() + "MacOS"+
 							      QDir::separator() + "OpenFlipper");
   #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
 
   if ( ! coreApp.exists() ) {

OpenFlipper/cmake/plugin.cmake

@@ -284,11 +284,7 @@ endmacro ()
 macro (_plugin_licensemanagement)
   acg_append_files (headers "LicenseManager.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
 
-  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")
-
+  if ( OPENFLIPPER_ENABLE_LICENSE_KEY_GENERATOR )
     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_ui  "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
@@ -329,6 +325,11 @@ macro (_plugin_licensemanagement)
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/LicenseManagement"
       )
     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)
     acg_append_files (headers "LicenseManagerDisabled.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
   endif()