clean up include installation for CMake #262

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2628 4e78687f-474d-0410-85f9-8d5e500ac6b2

3 files changed, 25 insertions, 14 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9a36aac..77d5d6f5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,20 @@ option(BUILD_PROJ "Build proj (cartographic projection tool : latlong <-> projec
 option(BUILD_GEOD "Build geod (computation of geodesic lines)" ON)
 option(BUILD_NAD2BIN "Build nad2bin (format conversion tool) " ON)
 
+if(NOT MSVC)
+  if (NOT APPLE)
+    # Use relative path so that package is relocatable
+    set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
+  else ()
+    set (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+    # TO DO: cmake 2.8.12 introduces a way to make the install tree
+    # relocatable with OSX via
+    # (1) set(CMAKE_MACOSX_RPATH ON) and
+    # (2) setting the INSTALL_RPATH property on the executables to
+    # "@loader_path/../lib"
+  endif ()
+endif ()
+
 if(BUILD_CS2CS)
  include(bin_cs2cs.cmake)
 endif(BUILD_CS2CS)
diff --git a/src/bin_geod.cmake b/src/bin_geod.cmake
index d06f4dd6..c6dff717 100644
--- a/src/bin_geod.cmake
+++ b/src/bin_geod.cmake
@@ -1,6 +1,6 @@
 set(GEOD_SRC geod.c
-             geodesic.c geod_set.c geod_interface.c )
-set(GEOD_INCLUDE  geodesic.h geod_interface.h)
+             geod_set.c geod_interface.c )
+set(GEOD_INCLUDE geod_interface.h)
 
 source_group("Source Files\\Bin" FILES ${GEOD_SRC} ${GEOD_INCLUDE})
 
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index d585b6fa..a2a9fd22 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -145,8 +145,10 @@ SET(SRC_LIBPROJ_CORE
         biveval.c
         dmstor.c
         emess.c
+        emess.h
         geocent.c
         geocent.h
+        geodesic.c
         mk_cheby.c
         nad_cvt.c
         nad_init.c
@@ -176,6 +178,7 @@ SET(SRC_LIBPROJ_CORE
         pj_inv.c
         pj_latlong.c
         pj_list.c
+        pj_list.h
         pj_log.c
         pj_malloc.c
         pj_mlfn.c
@@ -197,21 +200,15 @@ SET(SRC_LIBPROJ_CORE
         proj_rouss.c
         rtodms.c
         vector1.c
+        ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h
  )
 
-set(HEADERS_LIBPROJ_INSTALL
+set(HEADERS_LIBPROJ
         projects.h
         proj_api.h
         geodesic.h
 )
 
-set(HEADERS_LIBPROJ
-        ${HEADERS_LIBPROJ_INSTALL}
-        pj_list.h
-        emess.h
-        ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h
- )
-
 # Group source files for IDE source explorers (e.g. Visual Studio)
 source_group("Header Files" FILES ${HEADERS_LIBPROJ})
 source_group("Source Files\\Core" FILES ${SRC_LIBPROJ_CORE})
@@ -234,9 +231,9 @@ boost_report_value(JNI_SUPPORT)
 if(JNI_SUPPORT)
   set(SRC_LIBPROJ_CORE ${SRC_LIBPROJ_CORE}
                        jniproj.c )
-  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})
+  set(HEADERS_LIBPROJ ${HEADERS_LIBPROJ}
+                        org_proj4_PJ.h
+                        org_proj4_Projections.h)
   source_group("Source Files\\JNI" FILES ${SRC_LIBPROJ_JNI})
   add_definitions(-DJNI_ENABLED)
   include_directories( ${JNI_INCLUDE_DIRS})
@@ -310,7 +307,7 @@ install(TARGETS ${PROJ_CORE_TARGET}
         FRAMEWORK DESTINATION ${FRAMEWORKDIR})
 
 if(NOT BUILD_FRAMEWORKS_AND_BUNDLE)
-  install(FILES ${HEADERS_LIBPROJ_INSTALL}
+  install(FILES ${ALL_LIBPROJ_HEADERS}
         DESTINATION ${INCLUDEDIR})
 endif(NOT BUILD_FRAMEWORKS_AND_BUNDLE)