moved remaining branding logic in cmake file to the top so branding wont break...

moved remaining branding logic in cmake file to the top so branding wont break by hotfix for missing plugins

CMakeLists.txt

@@ -67,36 +67,6 @@ file (
 
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_more_macro_directories})
 
-set( OPENFLIPPER_PRODUCT_STRING "OpenFlipper" CACHE String "Product string used e.g. to determine the config file path. Should only contain alphanumeric characters (no spaces)." )
-
-# ========================================================================
-# QT Setup 
-# ========================================================================
-
-# Qt setup
-include(ACGQt)
-
-acg_qt5 ()
-
-if (NOT QT5_FOUND)
-  message(FATAL_ERROR "Could not found any QT Version. Please specify QT5_INSTALL_PATH (path to bin and include dir) to build with QT5")
-endif()
-
-set (OF_MAX_QT_VERSION "5.6.0")
-
-if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
-  message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
-endif()
-
-# ========================================================================
-# ========================================================================
-
-# include our cmake files
-include (ACGCommon)
-include (MSVCMacros)
-
-acg_get_version (OpenFlipper)
-
 # ========================================================================
 # Branding 
 # ========================================================================
@@ -138,6 +108,7 @@ endif()
 
 
 #Initialize with defaults, if not already set via branding cmake file
+set( OPENFLIPPER_PRODUCT_STRING "OpenFlipper" CACHE String "Product string used e.g. to determine the config file path. Should only contain alphanumeric characters (no spaces)." )
 set( OPENFLIPPER_PRODUCT_NAME "OpenFlipper" CACHE String "Product name used in all visible places (e.g. about box)." )
 
 if (BRANDING_HEADER)
@@ -147,6 +118,36 @@ endif ()
 add_definitions(-DPRODUCT_STRING=${OPENFLIPPER_PRODUCT_STRING})
 add_definitions(-DPRODUCT_NAME=${OPENFLIPPER_PRODUCT_NAME})
 
+# ========================================================================
+# QT Setup 
+# ========================================================================
+
+# Qt setup
+include(ACGQt)
+
+acg_qt5 ()
+
+if (NOT QT5_FOUND)
+  message(FATAL_ERROR "Could not found any QT Version. Please specify QT5_INSTALL_PATH (path to bin and include dir) to build with QT5")
+endif()
+
+set (OF_MAX_QT_VERSION "5.6.0")
+
+if (${Qt5Core_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
+  message(WARNING "Detected QT Version higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
+endif()
+
+# ========================================================================
+# ========================================================================
+
+# include our cmake files
+include (ACGCommon)
+include (MSVCMacros)
+
+acg_get_version (OpenFlipper)
+
+
+
 # ========================================================================
 # ========================================================================