diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-23 20:10:08 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-23 20:10:08 +0000 |
| commit | 51c3555d73d472727359dbe2ef6949e5640da043 (patch) | |
| tree | 98dc1969423fbde112a9edfceea70237ae2421bc | |
| parent | f5a29d6337bcb3cce59d7e524d29c7937e283291 (diff) | |
| download | PROJ-51c3555d73d472727359dbe2ef6949e5640da043.tar.gz PROJ-51c3555d73d472727359dbe2ef6949e5640da043.zip | |
add missing MSVC compilers to cmake config
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2634 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | cmake/Makefile.in | 8 | ||||
| -rw-r--r-- | cmake/Proj4SystemInfo.cmake | 6 |
3 files changed, 14 insertions, 2 deletions
@@ -33,6 +33,7 @@ o Add CMake project-config.cmake scripts (#264 from Charles Karney) + 4.9.0 Release Notes ------------------- @@ -56,6 +57,7 @@ o Various bug fixes and cleanup. + o Added the CalCOFI pseudo-projection, #135 4.8.0 Release Notes ------------------- diff --git a/cmake/Makefile.in b/cmake/Makefile.in index 2edd755b..bd9b8629 100644 --- a/cmake/Makefile.in +++ b/cmake/Makefile.in @@ -230,7 +230,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = Proj4InstallPath.cmake \ +EXTRA_DIST = CMakeLists.txt \ + Proj4InstallPath.cmake \ Proj4SystemInfo.cmake \ Proj4Utilities.cmake \ proj_config.cmake.in \ @@ -238,7 +239,10 @@ EXTRA_DIST = Proj4InstallPath.cmake \ Proj4Mac.cmake \ Proj4Test.cmake \ Proj4Version.cmake \ - policies.cmake + policies.cmake \ + proj_config.cmake.in \ + project-config-version.cmake.in \ + project-config.cmake.in all: all-am diff --git a/cmake/Proj4SystemInfo.cmake b/cmake/Proj4SystemInfo.cmake index 68c42274..294a50b2 100644 --- a/cmake/Proj4SystemInfo.cmake +++ b/cmake/Proj4SystemInfo.cmake @@ -44,6 +44,12 @@ if(WIN32) if(MSVC_VERSION EQUAL 1600) set(PROJ_COMPILER_NAME "msvc-10.0") #Visual Studio 2010 endif() + if(MSVC_VERSION EQUAL 1700) + set(PROJ_COMPILER_NAME "msvc-11.0") #Visual Studio 2012 + endif() + if(MSVC_VERSION EQUAL 1800) + set(PROJ_COMPILER_NAME "msvc-12.0") #Visual Studio 2013 + endif() endif(MSVC) if(MINGW) |