github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-03 16:10:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cross-compilation with mingw/linux (#758)

Browse Source
This commit is contained in:
Orgad Shaneh 2019-01-28 12:28:54 +02:00 committed by Dominic Hamon
parent 40fce80e0d
commit 5f2a107b17
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -33,7 +33,7 @@ endif()
# We need extra libraries on Windows # We need extra libraries on Windows
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
target_link_libraries(benchmark Shlwapi) target_link_libraries(benchmark shlwapi)
endif() endif()
set(include_install_dir "include") set(include_install_dir "include")

2
src/colorprint.cc
View File

@ -25,7 +25,7 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>

2
src/sleep.cc
View File

@ -21,7 +21,7 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Windows.h> #include <windows.h>
#endif #endif
namespace benchmark { namespace benchmark {

6
src/sysinfo.cc
View File

@ -15,9 +15,9 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Shlwapi.h> #include <shlwapi.h>
#include <VersionHelpers.h> #include <versionhelpers.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <fcntl.h> #include <fcntl.h>
#include <sys/resource.h> #include <sys/resource.h>

6
src/timers.cc
View File

@ -16,9 +16,9 @@
#include "internal_macros.h" #include "internal_macros.h"
#ifdef BENCHMARK_OS_WINDOWS #ifdef BENCHMARK_OS_WINDOWS
#include <Shlwapi.h> #include <shlwapi.h>
#include <VersionHelpers.h> #include <versionhelpers.h>
#include <Windows.h> #include <windows.h>
#else #else
#include <fcntl.h> #include <fcntl.h>
#include <sys/resource.h> #include <sys/resource.h>