From 04e154068a6f9012a6a2c76d947bacfe57000c58 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Sat, 21 Feb 2015 15:16:12 +0000 Subject: define default PROJ_LIB location for CMake build #261 git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2626 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- ChangeLog | 4 ++++ NEWS | 2 ++ src/lib_proj.cmake | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6e76e544..5a4e0982 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-02-21 Howard Butler + * src/lib_proj.cmake: define PROJ_LIB as part + of the compilation defines #261 + 2015-02-21 Even Rouault * src/lib_proj.cmake nad/CMakeLists.txt: cmake build: install nad.lst, geodesic.h. But not emess.h and pj_list.h (from Charles Karney) diff --git a/NEWS b/NEWS index 71dfd8d4..f785815b 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,8 @@ o Adapt Charles Karney's CMake patches for smoother build #258 + o Define default PROJ_LIB location for CMake compilation #261 + 4.9.0 Release Notes ------------------- diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index e308d127..d585b6fa 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -218,6 +218,10 @@ source_group("Source Files\\Core" FILES ${SRC_LIBPROJ_CORE}) source_group("Source Files\\PJ" FILES ${SRC_LIBPROJ_PJ}) source_group("CMake Files" FILES CMakeLists.txt) + +# Embed PROJ_LIB data files location +add_definitions(-DPROJ_LIB="${CMAKE_INSTALL_PREFIX}/${DATADIR}") + ################################################# ## java wrapping with jni ################################################# -- cgit v1.2.3