Use SC_DEFAULT_APIKEY from the environment if available

[ci skip]
Jundarer · Aug 6, 2016 · ab0f7da · ab0f7da
1 parent 7f8cb55
commit ab0f7da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cli/cli.pro b/cli/cli.pro
@@ -19,7 +19,7 @@ win32 {
 }
 
 # Deployment for Linux
-unix:!mac {
+unix:!macx {
   DISTFILES  += CHANGES COPYING
   INSTALLS   += target profiles
   # Disable strip

diff --git a/gui/gui.pro b/gui/gui.pro
@@ -70,7 +70,7 @@ win32 {
 }
 
 # Deplopyment for Linux, note, the cli project also copies profiles
-unix:!mac {
+unix:!macx {
   DISTFILES  += CHANGES COPYING
   INSTALLS   += target profiles data icon locale
   # Disable strip

diff --git a/lib/lib.pro b/lib/lib.pro
@@ -9,8 +9,15 @@ win32 {
   QMAKE_PROJECT_NAME = "Simulationcraft Engine"
 }
 
+# If apikey is in environment, use that
+ENV_APIKEY=$$(SC_DEFAULT_APIKEY)
+!isEmpty(ENV_APIKEY) {
+  SC_DEFAULT_APIKEY=$$(SC_DEFAULT_APIKEY)
+}
+
 !isEmpty(SC_DEFAULT_APIKEY) {
   DEFINES += SC_DEFAULT_APIKEY=\"$${SC_DEFAULT_APIKEY}\"
+  message($$SC_DEFAULT_APIKEY)
 }
 
 # On Linux compilation, setup the profile search directory