[Proj] 4.9.1RC1 Released

[Charles Karney]

On 2015-02-20 16:51, Howard Butler wrote:
> All,
>
> I have issued a 4.9.1RC1 which is now available for testing. Please test and report any issues via bug tracker or email. If there are no show-stoppers, I will motion to promote this release on Wednesday Feb 25th.
>
> http://download.osgeo.org/proj/proj-4.9.1RC1.tar.gz
>
> Howard

The following patch allows a reasonably clean (and error-free)
build of proj with cmake under Linux and Windows:

--- proj-4.9.1.orig/CMakeLists.txt	2015-02-20 16:20:35.000000000 -0500
+++ proj-4.9.1/CMakeLists.txt	2015-02-20 17:37:45.268811657 -0500
@@ -80,4 +80,4 @@
  message(STATUS "")
  add_subdirectory(nad)
  add_subdirectory(src)
-
+add_subdirectory(man)
--- proj-4.9.1.orig/src/bin_cs2cs.cmake	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1/src/bin_cs2cs.cmake	2015-02-20 18:01:30.248811545 -0500
@@ -9,6 +9,6 @@
  endif(WIN32)

  add_executable(cs2cs ${CS2CS_SRC} ${CS2CS_INCLUDE})
-target_link_libraries(cs2cs proj m)
+target_link_libraries(cs2cs ${PROJ_LIBRARIES})
  install(TARGETS cs2cs
          RUNTIME DESTINATION ${BINDIR})
--- proj-4.9.1.orig/src/bin_nad2bin.cmake	2015-02-20 16:20:34.000000000 
-0500
+++ proj-4.9.1/src/bin_nad2bin.cmake	2015-02-20 17:43:53.178818314 -0500
@@ -1,12 +1,12 @@
-if(WIN32 AND NOT BUILD_LIBPROJ_SHARED)
+if(WIN32 AND BUILD_LIBPROJ_SHARED)
      message(warning " nad2nad can't be build with a DLL proj4 library 
you need a static lib")
-endif(WIN32 AND NOT BUILD_LIBPROJ_SHARED)
+endif(WIN32 AND BUILD_LIBPROJ_SHARED)


  set(NAD2BIN_SRC nad2bin.c)
  source_group("Source Files\\Bin" FILES ${NAD2BIN_SRC})
  if(WIN32)
-    set(NAD2BIN_SRC ${NAD2BIN_SRC} ${NAD2BIN_SRC}/emess.c)
+    set(NAD2BIN_SRC ${NAD2BIN_SRC} emess.c)
  endif(WIN32)

  #Executable
--- proj-4.9.1.orig/src/lib_proj.cmake	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1/src/lib_proj.cmake	2015-02-20 17:33:29.718811747 -0500
@@ -204,7 +204,7 @@
          emess.h
          projects.h
          proj_api.h
-        proj_config.h
+        ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h
   )

  # Group source files for IDE source explorers (e.g. Visual Studio)
@@ -259,7 +259,7 @@
    set_target_properties(${PROJ_CORE_TARGET}
      PROPERTIES
      OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
-    VERSION  ${ ${PROJECT_INTERN_NAME}_VERSION }
+    VERSION  ${${PROJECT_INTERN_NAME}_VERSION}
      CLEAN_DIRECT_OUTPUT 1)
  elseif(BUILD_FRAMEWORKS_AND_BUNDLE)
    set_target_properties(${PROJ_CORE_TARGET}
--- proj-4.9.1.orig/src/PJ_aitoff.c	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1/src/PJ_aitoff.c	2015-02-20 17:52:20.248811584 -0500
@@ -34,6 +34,13 @@
  #define PJ_LIB__
  #include <projects.h>

+#ifndef M_PI
+#  define M_PI 3.14159265358979323846
+#endif
+#ifndef M_PI_2
+#  define M_PI_2 1.57079632679489661923
+#endif
+
  PJ_CVSID("$Id: PJ_aitoff.c 2609 2015-02-17 17:05:09Z hobu $");

  PROJ_HEAD(aitoff, "Aitoff") "\n\tMisc Sph";
--- proj-4.9.1.orig/src/pj_gridinfo.c	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1/src/pj_gridinfo.c	2015-02-20 17:22:11.109773952 -0500
@@ -41,7 +41,7 @@
   * TODO - mloskot: re-implement porting friendly assert
   */
  # define assert(exp)	((void)0)
-#else/
+#else
  # include <assert.h>
  #endif /* _WIN32_WCE */

--- /dev/null	2015-01-06 08:23:25.496203464 -0500
+++ proj-4.9.1/cmake/policies.cmake	2015-02-20 17:21:03.343189445 -0500
@@ -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()
--- /dev/null	2015-01-06 08:23:25.496203464 -0500
+++ proj-4.9.1/man/CMakeLists.txt	2015-02-20 17:38:37.968811676 -0500
@@ -0,0 +1,5 @@
+install (FILES man1/proj.1 man1/cs2cs.1 man1/geod.1
+  DESTINATION share/man/man1)
+
+install (FILES man3/pj_init.3 man3/geodesic.3
+  DESTINATION share/man/man3)