Changeset 322 in pacpusframework

Timestamp:

Oct 28, 2014, 12:36:37 PM (10 years ago)

Author:

Marek Kurdej

Message:

Clean finding WINSDK_LIB.

Location:

trunk

Files:

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

trunk/CMakeLists.txt

@@ -13 +13 @@
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW) # for QT5.1 on windows / not work on linux
+endif()
+if(POLICY CMP0026)
+    # allow using LOCATION_DEBUG in cmake/PacpusUtilities.cmake
+    cmake_policy(SET CMP0026 OLD)
 endif()
 

trunk/cmake/PacpusDependencies.cmake

@@ -18 +18 @@
 set(QT_CMAKE_DIR "$ENV{QT_BIN}/../lib/cmake")
 get_filename_component(QT_CMAKE_DIR "${QT_CMAKE_DIR}" ABSOLUTE)
-if(DEBUG)
-    message(STATUS "\${QT_CMAKE_DIR} = '${QT_CMAKE_DIR}'")
-endif()
+message(STATUS "\${QT_CMAKE_DIR} = '${QT_CMAKE_DIR}'")
 list(APPEND CMAKE_PREFIX_PATH
     ${QT_CMAKE_DIR}
@@ -26 +24 @@
 if(WIN32)
     set(WINSDK_LIB "$ENV{WINSDK_LIB}" CACHE PATH "Directory of Windows Development Kit, should contain glu32.lib.")
+    find_library(GLU32_LIB_PATH glu32 "${WINSDK_LIB}" "$ENV{WINSDK_LIB}")
+    get_filename_component(WINSDK_LIB "${GLU32_LIB_PATH}" DIRECTORY)
     if("${WINSDK_LIB}" STREQUAL "")
-        message(STATUS "Environment variable 'WINSDK_LIB' should be set to something like 'C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86'")
-    endif()
-    if(DEBUG)
+        message(STATUS "Environment variable 'WINSDK_LIB' should be set to the path containing glu32 library, e.g. 'C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86'")
+    else()
         message(STATUS "\$ENV{WINSDK_LIB} = '$ENV{WINSDK_LIB}'")
         message(STATUS "\${WINSDK_LIB} = '${WINSDK_LIB}'")