diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nad/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 17 |
3 files changed, 17 insertions, 7 deletions
@@ -1,4 +1,8 @@ 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) + +2015-02-21 Even Rouault <even.rouault@spatialys.com> * src/pj_gridinfo.c: remove trailing / from preprocessor line (from Charles Karney) diff --git a/nad/CMakeLists.txt b/nad/CMakeLists.txt index e95b0cd8..df8a8c29 100644 --- a/nad/CMakeLists.txt +++ b/nad/CMakeLists.txt @@ -11,7 +11,8 @@ set(PROJ_DICTIONARY epsg nad27 GL27 nad83 - nad.lst ) + nad.lst + CH ) # # gridshift file diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 1debba45..e308d127 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -199,11 +199,16 @@ SET(SRC_LIBPROJ_CORE vector1.c ) +set(HEADERS_LIBPROJ_INSTALL + projects.h + proj_api.h + geodesic.h +) + set(HEADERS_LIBPROJ + ${HEADERS_LIBPROJ_INSTALL} pj_list.h emess.h - projects.h - proj_api.h ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h ) @@ -225,9 +230,9 @@ boost_report_value(JNI_SUPPORT) if(JNI_SUPPORT) set(SRC_LIBPROJ_CORE ${SRC_LIBPROJ_CORE} jniproj.c ) - set(HEADERS_LIBPROJ ${HEADERS_LIBPROJ} - org_proj4_PJ.h - org_proj4_Projections.h) + set(HEADERS_JNI org_proj4_PJ.h org_proj4_Projections.h) + set(HEADERS_LIBPROJ_INSTALL ${HEADERS_LIBPROJ_INSTALL} ${HEADERS_JNI}) + set(HEADERS_LIBPROJ ${HEADERS_LIBPROJ} ${HEADERS_JNI}) source_group("Source Files\\JNI" FILES ${SRC_LIBPROJ_JNI}) add_definitions(-DJNI_ENABLED) include_directories( ${JNI_INCLUDE_DIRS}) @@ -301,7 +306,7 @@ install(TARGETS ${PROJ_CORE_TARGET} FRAMEWORK DESTINATION ${FRAMEWORKDIR}) if(NOT BUILD_FRAMEWORKS_AND_BUNDLE) - install(FILES ${ALL_LIBPROJ_HEADERS} + install(FILES ${HEADERS_LIBPROJ_INSTALL} DESTINATION ${INCLUDEDIR}) endif(NOT BUILD_FRAMEWORKS_AND_BUNDLE) |