Use CMake to link Shlwapi on Windows

We use the SHGetValueA on Windows to retrieve the MHz of the processor but this requires the shlwapi library. Previous to this patch the library was linked with a MSVC specific pragma but there is no guarantee that on Windows we will be using MSVC. Therefore, it is much compile agnostic to use the standard CMAKE library linking mechanism to provide the definition of SHGetValueA

Use CMake to link Shlwapi on Windows
6bc54ba0 · Matt Clarkson · dd61391c · 6bc54ba0 · 6bc54ba0
Commit 6bc54ba0 authored Nov 03, 2014 by Matt Clarkson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CMakeLists.txt src/CMakeLists.txt +5 -0

sysinfo.cc src/sysinfo.cc +0 -1

No files found.
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,6 +32,11 @@ set_target_properties(benchmark PROPERTIES
  SOVERSION ${GENERIC_LIB_SOVERSION}
  )

+# We need extra libraries on Windows
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  target_link_libraries(benchmark Shlwapi)
+endif()
+
 # Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable)
 install(
  TARGETS benchmark

--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -233,7 +233,6 @@ void InitializeSystemInfo() {
 // TODO: also figure out cpuinfo_num_cpus

 #elif defined OS_WINDOWS
-#pragma comment(lib, "shlwapi.lib")  // for SHGetValue()
  // In NT, read MHz from the registry. If we fail to do so or we're in win9x
  // then make a crude estimate.
  OSVERSIONINFO os;