diff options
| author | Howard Butler <howard@hobu.co> | 2014-09-13 22:50:19 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2014-09-13 22:50:19 +0000 |
| commit | c310d136e649d30a0b6de0505df5165df58d7e00 (patch) | |
| tree | 55ff33cf8709207740435ef2dc3f692c8aba3cb6 | |
| parent | 9a077efd818572bdfb250e51ae8e537b8d39d95f (diff) | |
| download | PROJ-c310d136e649d30a0b6de0505df5165df58d7e00.tar.gz PROJ-c310d136e649d30a0b6de0505df5165df58d7e00.zip | |
more CMake-related dist fixups #243
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2531 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f707746..82df1707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################################################# # -# This file is part of CMake configuration for PROJ4 library (inspired from SOCI +# This file is part of CMake configuration for PROJ4 library (inspired from SOCI # CMake, Copyright (C) 2009-2010 Mateusz Loskot <mateusz@loskot.net> ) # # Copyright (C) 2011 Nicolas David <nicolas.david@ign.fr> @@ -78,5 +78,4 @@ include_directories(${PROJ4_SOURCE_DIR}/src) message(STATUS "") add_subdirectory(nad) add_subdirectory(src) -add_subdirectory(html) diff --git a/cmake/Makefile.am b/cmake/Makefile.am new file mode 100644 index 00000000..051f97f1 --- /dev/null +++ b/cmake/Makefile.am @@ -0,0 +1,8 @@ +EXTRA_DIST = Proj4InstallPath.cmake \ + Proj4SystemInfo.cmake \ + Proj4Utilities.cmake \ + proj_config.cmake.in \ + Proj4Config.cmake \ + Proj4Mac.cmake \ + Proj4Test.cmake \ + Proj4Version.cmake diff --git a/configure.in b/configure.in index 5c7f157d..d348a8c2 100644 --- a/configure.in +++ b/configure.in @@ -99,7 +99,7 @@ fi AC_SUBST(MUTEX_SETTING,$MUTEX_SETTING) -AC_OUTPUT(Makefile src/Makefile man/Makefile man/man1/Makefile \ +AC_OUTPUT(Makefile cmake/Makefile src/Makefile man/Makefile man/man1/Makefile \ man/man3/Makefile nad/Makefile \ jniwrap/Makefile jniwrap/org/Makefile jniwrap/org/proj4/Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 50eb416b..d4f8e20b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,9 @@ INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \ include_HEADERS = proj_api.h projects.h geodesic.h \ org_proj4_Projections.h org_proj4_PJ.h -EXTRA_DIST = makefile.vc proj.def +EXTRA_DIST = makefile.vc proj.def bin_cs2cs.cmake \ + bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake \ + lib_proj.cmake CMakeLists.txt proj_SOURCES = proj.c gen_cheb.c p_series.c cs2cs_SOURCES = cs2cs.c gen_cheb.c p_series.c |