diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-21 15:16:12 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-21 15:16:12 +0000 |
| commit | 04e154068a6f9012a6a2c76d947bacfe57000c58 (patch) | |
| tree | 91290b0bab6b1f3cce54aaf5e87b446c4f08415f | |
| parent | 1fb727832b9652310f6481d07ab843a12b9d5fc3 (diff) | |
| download | PROJ-04e154068a6f9012a6a2c76d947bacfe57000c58.tar.gz PROJ-04e154068a6f9012a6a2c76d947bacfe57000c58.zip | |
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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 4 |
3 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2015-02-21 Howard Butler <howard@hobu.co> + * src/lib_proj.cmake: define PROJ_LIB as part + of the compilation defines #261 + 2015-02-21 Even Rouault <even.rouault@spatialys.com> * 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) @@ -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 ################################################# |