Changeset 323 in pacpusframework

Timestamp:

10/28/14 13:01:45 (10 years ago)

Author:

Marek Kurdej

Message:

Add auto-finding WINSDK_LIB.

File:

• trunk/cmake/PacpusDependencies.cmake (modified) (1 diff)

trunk/cmake/PacpusDependencies.cmake

@@ -23 +23 @@
 )
 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)
+    find_library(GLU32_LIB_PATH
+        NAMES glu32
+        HINTS
+            "${WINSDK_LIB}"
+            "$ENV{WINSDK_LIB}"
+            # 8.1
+            "C:/Program Files/Windows Kits/8.1/Lib/winv6.3/um/x86"
+            "C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x86"
+            "C:/Program Files/Windows Kits/8.1/Lib/winv6.3/um/x64"
+            "C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64"
+            # 8.0
+            "C:/Program Files/Windows Kits/8.0/Lib/win8/um/x86"
+            "C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86"
+            "C:/Program Files/Windows Kits/8.0/Lib/win8/um/x64"
+            "C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64"
+    )
+    get_filename_component(GLU32_LIB_DIR "${GLU32_LIB_PATH}" DIRECTORY)
+    set(WINSDK_LIB "${GLU32_LIB_DIR}" CACHE PATH "Directory of Windows Development Kit, should contain glu32.lib.")
     if("${WINSDK_LIB}" STREQUAL "")
         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'")