Changeset 175 in pacpusframework

Timestamp:

10/08/13 17:00:20 (11 years ago)

Author:

morasjul

Message:

[cmake] Fixed: Qt5 dependencies on Windows.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/PacpusDependencies.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -95 +95 @@
 # ========================================
 include(${PACPUS_CMAKE_DIR}/PacpusInstall.cmake)
-set( ENV{PACPUS_ROOT} ${PACPUS_INSTALL_DIR} )
+set(ENV{PACPUS_ROOT} ${PACPUS_INSTALL_DIR})
 
 # ========================================

trunk/cmake/PacpusDependencies.cmake

@@ -25 +25 @@
 
 if(PACPUS_USE_QT5)
-message(STATUS "Set CMake variable 'CMAKE_PREFIX_PATH' to the path like '%QT_BIN%/../lib/cmake'")
+    # message(STATUS "Set CMake variable 'CMAKE_PREFIX_PATH' to the path like '%QT_BIN%/../lib/cmake'")
+    set(QT_CMAKE_DIR "$ENV{QT_BIN}/../lib/cmake")
+    get_filename_component(QT_CMAKE_DIR "${QT_CMAKE_DIR}" ABSOLUTE)
+    message(STATUS "\${QT_CMAKE_DIR} = '${QT_CMAKE_DIR}'")
+    list(APPEND CMAKE_PREFIX_PATH
+        ${QT_CMAKE_DIR}
+    )
+    if(WIN32)
+        message(STATUS "Environment variable 'WINSDK_LIB' should be set to something like 'C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86'")
+        message(STATUS "\$ENV{WINSDK_LIB} = '$ENV{WINSDK_LIB}'")
+        list(APPEND CMAKE_PREFIX_PATH
+            $ENV{WINSDK_LIB}
+        )
+    endif()
 # ========================================
 # All the Pacpus modules depend on Qt5