Browse Source

Fix dependencies.

Tobias Hieta 9 years ago
parent
commit
5027591189
2 changed files with 8 additions and 2 deletions
  1. 2 2
      CMakeModules/FetchDependencies.cmake
  2. 6 0
      CMakeModules/QtConfiguration.cmake

+ 2 - 2
CMakeModules/FetchDependencies.cmake

@@ -101,9 +101,9 @@ function(download_deps DD_NAME)
       WORKING_DIRECTORY ${DEP_DIR}
     )
     if(APPLE)
-      message(STATUS "Fixing install library names...")
+      message(STATUS "Fixing install library names...${DEP_DIR}/${DEP_DIRNAME}")
       execute_process(
-        COMMAND ${PROJECT_SOURCE_DIR}/scripts/darwin/fix-install-names.py ${DEP_DIR}/${DEP_DIRNAME}
+        COMMAND ${PROJECT_SOURCE_DIR}/scripts/fix-install-names.py ${DEP_DIR}/${DEP_DIRNAME}
         WORKING_DIRECTORY ${DEP_DIR}
       )
       message(STATUS "Done")

+ 6 - 0
CMakeModules/QtConfiguration.cmake

@@ -1,11 +1,17 @@
 
 include(FetchDependencies)
+
+if(WIN32)
+  set(WINARCHSTR ARCHSTR windows-x86_64)
+endif(WIN32)
+
 if(NOT IS_DIRECTORY ${QTROOT})
   download_deps(
 		"plexmediaplayer-qt"
 		DIRECTORY dir
 		DEPHASH QT_DEPS_HASH
     ARTIFACTNAME konvergo-qt
+    ${WINARCHSTR}
 	)
   set(QTROOT ${dir})
 endif()