From c7c689fbb90abb0cae54937bd6e5560c10b7d434 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 26 Jul 2017 11:34:40 -0700 Subject: [PATCH 1/3] Delete ancient Visual Studio Solution file. --- google-glog.sln | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100755 google-glog.sln diff --git a/google-glog.sln b/google-glog.sln deleted file mode 100755 index a34ec723a..000000000 --- a/google-glog.sln +++ /dev/null @@ -1,44 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglog", "vsprojects\libglog\libglog.vcproj", "{34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logging_unittest", "vsprojects\logging_unittest\logging_unittest.vcproj", "{DD0690AA-5E09-46B5-83FD-4B28604CABA8}" - ProjectSection(ProjectDependencies) = postProject - {34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1} = {34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglog_static", "vsprojects\libglog_static\libglog_static.vcproj", "{772C2111-BBBF-49E6-B912-198A7F7A88E5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logging_unittest_static", "vsprojects\logging_unittest_static\logging_unittest_static.vcproj", "{9B239B45-84A9-4E06-AC46-8E220CD43974}" - ProjectSection(ProjectDependencies) = postProject - {772C2111-BBBF-49E6-B912-198A7F7A88E5} = {772C2111-BBBF-49E6-B912-198A7F7A88E5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1}.Debug|Win32.ActiveCfg = Debug|Win32 - {34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1}.Debug|Win32.Build.0 = Debug|Win32 - {34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1}.Release|Win32.ActiveCfg = Release|Win32 - {34BD04BD-BC1D-4BFC-AAFC-ED02D9E960F1}.Release|Win32.Build.0 = Release|Win32 - {DD0690AA-5E09-46B5-83FD-4B28604CABA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {DD0690AA-5E09-46B5-83FD-4B28604CABA8}.Debug|Win32.Build.0 = Debug|Win32 - {DD0690AA-5E09-46B5-83FD-4B28604CABA8}.Release|Win32.ActiveCfg = Release|Win32 - {DD0690AA-5E09-46B5-83FD-4B28604CABA8}.Release|Win32.Build.0 = Release|Win32 - {772C2111-BBBF-49E6-B912-198A7F7A88E5}.Debug|Win32.ActiveCfg = Debug|Win32 - {772C2111-BBBF-49E6-B912-198A7F7A88E5}.Debug|Win32.Build.0 = Debug|Win32 - {772C2111-BBBF-49E6-B912-198A7F7A88E5}.Release|Win32.ActiveCfg = Release|Win32 - {772C2111-BBBF-49E6-B912-198A7F7A88E5}.Release|Win32.Build.0 = Release|Win32 - {9B239B45-84A9-4E06-AC46-8E220CD43974}.Debug|Win32.ActiveCfg = Debug|Win32 - {9B239B45-84A9-4E06-AC46-8E220CD43974}.Debug|Win32.Build.0 = Debug|Win32 - {9B239B45-84A9-4E06-AC46-8E220CD43974}.Release|Win32.ActiveCfg = Release|Win32 - {9B239B45-84A9-4E06-AC46-8E220CD43974}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal From 9f121e549332f742d85670c66c930de1831404e7 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 26 Jul 2017 11:34:52 -0700 Subject: [PATCH 2/3] Update gitignore for CMake and Visual Studio --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index cf890f634..0b99cca15 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,10 @@ autom4te.cache glog-*.tar.gz packages/rpm-unknown packages/debian-* +CMakeCache.txt +CMakeFiles/ +*.cmake +config.h +*.sln +*.vcxproj +*.filters \ No newline at end of file From a2a66f611c1c5ac02d96df88352b2ce11183cdcd Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 26 Jul 2017 11:35:04 -0700 Subject: [PATCH 3/3] Update Windows readme for CMake --- README.windows | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/README.windows b/README.windows index dbeef321b..ea6ccc20b 100644 --- a/README.windows +++ b/README.windows @@ -1,26 +1,17 @@ -This project has begun being ported to Windows. A working solution -file exists in this directory: - google-glog.sln +This project has been ported to Windows, including stack tracing, signal +handling, and unit tests. -You can load this solution file into VC++ 9.0 (Visual Studio -2008). You may also be able to use this solution file with older -Visual Studios by converting the solution file. +A Visual Studio solution file is explicitly not provided because it is not +maintainable. Instead, a CMake build system exists to generate the correct +solution for your version of Visual Studio. -Note that stack tracing and some unittests are not ported -yet. +In short, + (1) Install CMake from: https://cmake.org/download/ + (2) With CMake on your PATH, run `cmake .` to generate the build files + (3) Either use `cmake --build`, or open the generated solution -You can also link glog code in statically -- see the example project -libglog_static and logging_unittest_static, which does this. For this -to work, you'll need to add "/D GOOGLE_GLOG_DLL_DECL=" to the compile -line of every glog's .cc file. - -I have little experience with Windows programming, so there may be -better ways to set this up than I've done! If you run across any -problems, please post to the google-glog Google Group, or report -them on the google-glog Google Code site: - http://groups.google.com/group/google-glog - https://github.com/google/glog/issues - --- Shinichiro Hamaji - -Last modified: 23 January 2009 +CMake provides different generators, and by default will pick the most relevant +one to your environment. If you need a specific version of Visual Studio, use +`cmake . -G `, and see `cmake --help` for the available +generators. Also see `-T `, which can used to request the native +x64 toolchain with `-T host=x64`. \ No newline at end of file