From 3c13cec4b7d32ab167f500258956fa034fa9ff34 Mon Sep 17 00:00:00 2001 From: Haitao Zhang Date: Sat, 26 Sep 2015 18:32:53 -0700 Subject: [PATCH 1/3] Change cmake MinGW build default to include thread support. --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 242a1ea2..e05c03be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,11 @@ if(WIN32) if(MINGW) add_definitions(-DNANA_MINGW) add_definitions(-DSTD_CODECVT_NOT_SUPPORTED) - option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8.1") + option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON) + endif() + endif() if(NANA_THREAD_NOT_SUPPORTED) add_definitions(-DSTD_THREAD_NOT_SUPPORTED) endif() From 43372225494e81373b37d063e805155a08d3b7d6 Mon Sep 17 00:00:00 2001 From: Haitao Zhang Date: Sat, 26 Sep 2015 18:33:54 -0700 Subject: [PATCH 2/3] Fix return char * when path is expected by explicit cast to nana::string first. --- source/filesystem/filesystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/filesystem/filesystem.cpp b/source/filesystem/filesystem.cpp index 51d70ff4..215a587e 100644 --- a/source/filesystem/filesystem.cpp +++ b/source/filesystem/filesystem.cpp @@ -430,7 +430,7 @@ namespace nana { delete[] p; return s; } - return buf; + return (nana::string) buf; } #elif defined(NANA_LINUX) const char * s = ::getenv("PWD"); From 7e493155113e956804644c1089c889515fcdfbdc Mon Sep 17 00:00:00 2001 From: Haitao Zhang Date: Sat, 26 Sep 2015 18:43:01 -0700 Subject: [PATCH 3/3] Add autogenerated files by CMake and ninja to .gitignore. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index a8f12de9..7e623b17 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,7 @@ _ReSharper*/ *.suo *.sdf lib/ +*.ninja* +CMakeCache.txt +CMakeFiles/ +cmake_install.cmake