Browse Source

Fix dependency hashes in debug printout.

Tobias Hieta 9 years ago
parent
commit
4af19606dc

+ 2 - 0
CMakeModules/DependencyConfiguration.cmake

@@ -8,6 +8,7 @@ if(APPLE AND NOT DISABLE_BUNDLED_DEPS)
     "plexmediaplayer-dependencies"
     ARTIFACTNAME konvergo-depends
     DIRECTORY dir
+    DEPHASH_VAR DEPS_HASH
     DYLIB_SCRIPT_PATH ${PROJECT_SOURCE_DIR}/scripts/fix-install-names.py
   )
   message("dependencies are: ${dir}")
@@ -20,6 +21,7 @@ if(WIN32)
     DIRECTORY dir
     ARTIFACTNAME konvergo-depends-windows
     ARCHSTR mingw32-x86_64
+    DEPHASH_VAR DEPS_HASH
   )
   if(NOT EXISTS ${dir}/lib/mpv.lib)
     execute_process(

+ 4 - 1
CMakeModules/FetchDependencies.cmake

@@ -50,7 +50,7 @@ function(get_content_of_url)
 endfunction(get_content_of_url)
 
 function(download_deps DD_NAME)
-  set(ARGS DIRECTORY BUILD_NUMBER ARTIFACTNAME VARIANT DEPHASH ARCHSTR DYLIB_SCRIPT_PATH)
+  set(ARGS DIRECTORY BUILD_NUMBER ARTIFACTNAME VARIANT DEPHASH_VAR ARCHSTR DYLIB_SCRIPT_PATH)
   cmake_parse_arguments(DD "" "${ARGS}" "" ${ARGN})
 
   if(NOT DEFINED DD_VARIANT)
@@ -84,6 +84,9 @@ function(download_deps DD_NAME)
   endif()
 
   message(STATUS "Dependency hash is: ${DEP_HASH}")
+  if(DD_DEPHASH_VAR)
+    set(${DD_DEPHASH_VAR} ${DEP_HASH} PARENT_SCOPE)
+  endif()
 
   set(DEP_DIRNAME "${DD_ARTIFACTNAME}-${DD_ARCHSTR}-${DD_VARIANT}-${DEP_HASH}")
   set(DEP_FILENAME ${DEP_DIRNAME}.tbz2)

+ 1 - 1
CMakeModules/QtConfiguration.cmake

@@ -9,7 +9,7 @@ if(NOT IS_DIRECTORY ${QTROOT})
   download_deps(
 		"plexmediaplayer-qt"
 		DIRECTORY dir
-		DEPHASH QT_DEPS_HASH
+		DEPHASH_VAR QT_DEPS_HASH
     ARTIFACTNAME konvergo-qt
     ${WINARCHSTR}
     DYLIB_SCRIPT_PATH ${PROJECT_SOURCE_DIR}/scripts/fix-install-names.py