From b6db90d054e78b1331e117b03be8470c1d251b3e Mon Sep 17 00:00:00 2001
From: Howard Butler <howard@hobu.co>
Date: Tue, 17 Feb 2015 16:52:44 +0000
Subject: #256: CMake tweaks

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2608 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 CMakeLists.txt       | 3 ++-
 ChangeLog            | 6 ++++++
 cmake/policies.cmake | 5 +++++
 src/lib_proj.cmake   | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 cmake/policies.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f74a83c5..10ea19ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
 #PROJ version information
 #################################################################################
 include(Proj4Version)
-proj_version(MAJOR 4 MINOR 9 PATCH 1)
+proj_version(MAJOR 4 MINOR 9 PATCH 0)
 
 #################################################################################
 # Build features and variants
@@ -39,6 +39,7 @@ proj_version(MAJOR 4 MINOR 9 PATCH 1)
 include(Proj4SystemInfo)
 include(Proj4Config)
 include(Proj4Mac)
+include(policies)
 
 boost_report_value(PROJ_PLATFORM_NAME)
 boost_report_value(PROJ_COMPILER_NAME)
diff --git a/ChangeLog b/ChangeLog
index dfc45eb7..f3abb646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-17 Howard Butler <howard@hobu.co>
+	* CMakeLists.txt cmake/policies.cmake src/lib_proj.cmake: #256 
+	CMake tweaks to shut off some noisy policies, fix installation 
+	of proj_config header, and shut off Framework building by 
+	default on OSX
+
 2015-02-17 Howard Butler <howard@hobu.co>
 	* src/lib_proj.cmake CMakeLists: Fix #248 healpix compilation typo
 
diff --git a/cmake/policies.cmake b/cmake/policies.cmake
new file mode 100644
index 00000000..c16fbc12
--- /dev/null
+++ b/cmake/policies.cmake
@@ -0,0 +1,5 @@
+if (CMAKE_MAJOR_VERSION GREATER 2)
+    cmake_policy(SET CMP0022 OLD) # interface link libraries
+    cmake_policy(SET CMP0042 NEW) # osx rpath
+    cmake_policy(SET CMP0011 NEW) # policy setting
+endif()
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index d56f77d3..c6424efb 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -204,6 +204,7 @@ set(HEADERS_LIBPROJ
         emess.h
         projects.h
         proj_api.h
+        proj_config.h
  )
 
 # Group source files for IDE source explorers (e.g. Visual Studio)
@@ -276,7 +277,6 @@ endif()
 set_target_properties(${PROJ_CORE_TARGET}
     PROPERTIES
     LINKER_LANGUAGE C)
-add_dependencies(${PROJ_CORE_TARGET} proj_config.h)
 
 ##############################################
 # Link properties
-- 
cgit v1.2.3