Add mingw support (#147)

* Lowercase Windows include files to support minw@Linux

* Add CELERO_COMPILE_FPIC to enable/desable fPIC (enabled by default)

* Use CMake's CXX_STANDARD+CXX_EXTENSIONS to set c++ standard

* Install implib+library in same directory

- Add .dll to implib on MSVC, this suffix is already added on mingw

Author: madebr

CMakeLists.txt

@@ -24,27 +24,29 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
 
 macro(CeleroSetDefaultCompilerOptions)
+	set_target_properties(${PROJECT_NAME} PROPERTIES
+		POSITION_INDEPENDENT_CODE "${CELERO_COMPILE_PIC}"
+	)
 	if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_VARIADIC_MAX=10 )
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_CRT_SECURE_NO_WARNINGS)
 		target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
 		target_compile_options(${PROJECT_NAME} PRIVATE /MP)
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_SCL_SECURE_NO_WARNINGS)
 		target_compile_options(${PROJECT_NAME} PRIVATE /permissive-)
-		target_compile_options(${PROJECT_NAME} PRIVATE /std:c++14)
 
         if(CELERO_TREAT_WARNINGS_AS_ERRORS)
             target_compile_options(${PROJECT_NAME} PRIVATE /WX)
 		endif()
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			ARCHIVE_OUTPUT_NAME "${PROJECT_NAME}.dll")
 
 	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
 		target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
-		target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
-		target_compile_options(${PROJECT_NAME} PRIVATE -std=c++14)
 
 	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
 		if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
-			target_compile_options(${PROJECT_NAME} PRIVATE -Xclang -std=c++14)
+			target_compile_options(${PROJECT_NAME} PRIVATE -Xclang)
 			target_compile_options(${PROJECT_NAME} PRIVATE -Wno-c++98-compat)
 			target_compile_options(${PROJECT_NAME} PRIVATE -Wno-c++98-compat-pedantic)
 			target_compile_options(${PROJECT_NAME} PRIVATE -Wno-reserved-id-macro)
@@ -53,17 +55,13 @@ macro(CeleroSetDefaultCompilerOptions)
 			endif()
 		else()
 			target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
-			target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
-			target_compile_options(${PROJECT_NAME} PRIVATE -std=c++14)
 			if(CELERO_TREAT_WARNINGS_AS_ERRORS)
 				target_compile_options(${PROJECT_NAME} PRIVATE -Werror)
 			endif()
 		endif()
 
 	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL AppleClang)
 		target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
-		target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
-		target_compile_options(${PROJECT_NAME} PRIVATE -std=c++14)
 
 		if(CELERO_TREAT_WARNINGS_AS_ERRORS)
 			target_compile_options(${PROJECT_NAME} PRIVATE -Werror)
@@ -83,6 +81,7 @@ include(CheckIncludeFile)
 #
 
 option(CELERO_COMPILE_DYNAMIC_LIBRARIES "Set to ON to build Celero for dynamic linking.  Use OFF for static." ON)
+option(CELERO_COMPILE_PIC "Set to ON to build Celero as a position-independent library." ON)
 option(CELERO_ENABLE_EXPERIMENTS "Set to ON to automatically build all examples." OFF)
 option(CELERO_ENABLE_FOLDERS "Enable to put Celero in its own solution folder under Visual Studio" ON)
 option(CELERO_ENABLE_TESTS "Enable building and running unit tests." OFF)
@@ -101,6 +100,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 #
 
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_DEBUG_POSTFIX          "d" CACHE STRING "add a postfix, usually d on windows")
 set(CMAKE_RELEASE_POSTFIX        ""  CACHE STRING "add a postfix, usually empty on windows")
@@ -176,9 +176,9 @@ target_sources(${PROJECT_NAME} PRIVATE
 	src/Utilities.cpp
 )
 
-if(MSVC)
+if(WIN32)
 	set(SYSLIBS
-		PowrProf.lib
+		powrprof psapi
 		)
 else()
 	#pthread is required for std::thread to work.
@@ -204,7 +204,7 @@ install(TARGETS ${PROJECT_NAME}
   EXPORT ${PROJECT_NAME}-target
   RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
   LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/static
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 )
 
 install(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})

include/celero/Export.h

@@ -25,11 +25,11 @@
 #else
 #ifdef WIN32
 #if defined CELERO_EXPORTS
-#define CELERO_EXPORT _declspec(dllexport)
-#define CELERO_EXPORT_C extern "C" _declspec(dllexport)
+#define CELERO_EXPORT __declspec(dllexport)
+#define CELERO_EXPORT_C extern "C" __declspec(dllexport)
 #else
-#define CELERO_EXPORT _declspec(dllimport)
-#define CELERO_EXPORT_C extern "C" _declspec(dllimport)
+#define CELERO_EXPORT __declspec(dllimport)
+#define CELERO_EXPORT_C extern "C" __declspec(dllimport)
 #endif
 #else
 #define CELERO_EXPORT

src/Console.cpp

@@ -21,7 +21,7 @@
 using namespace celero;
 
 #ifdef WIN32
-#include <Windows.h>
+#include <windows.h>
 #include <stdio.h>
 #else
 #include <iostream>

src/Exceptions.cpp

@@ -22,7 +22,7 @@
 #include <celero/TestFixture.h>
 
 #ifdef WIN32
-#include <Windows.h>
+#include <windows.h>
 #endif // WIN32
 
 #include <iomanip>

src/Memory.cpp

@@ -19,10 +19,10 @@
 #include <celero/Memory.h>
 #include <sstream>
 
-#ifdef WIN32
-#include <Windows.h>
+#ifdef _WIN32
+#include <windows.h>
 
-#include <Psapi.h>
+#include <psapi.h>
 #elif defined(__APPLE__)
 #include <sys/param.h>
 #include <sys/sysctl.h>

src/Timer.cpp

@@ -21,7 +21,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#include <Windows.h>
+#include <windows.h>
 LARGE_INTEGER QPCFrequency;
 #else
 #include <chrono>

src/Utilities.cpp

@@ -20,9 +20,9 @@
 #include <celero/Utilities.h>
 
 #ifdef WIN32
-#include <Windows.h>
+#include <windows.h>
 
-#include <PowrProf.h>
+#include <powrprof.h>
 #endif
 
 #ifdef max