diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | cmake/Proj4Mac.cmake | 2 | ||||
| -rw-r--r-- | man/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/bin_cs2cs.cmake | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 4 |
7 files changed, 20 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cb78613c..7088fe13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,4 +80,5 @@ include_directories(${PROJ4_SOURCE_DIR}/src) message(STATUS "") add_subdirectory(nad) add_subdirectory(src) +add_subdirectory(man) @@ -1,4 +1,10 @@ -2015-02-17 Howard Butler <howard@hobu.co> +2015-02-20 Howard Butler <howard@hobu.co> + * CMakeLists.txt cmake/Proj4Mac.cmake + man/CMakeLists.txt src/bin_cs2cs.cmake + src/lib_proj.cmake: Adapt Charles Karney + CMake patches for smoother build #258 + +2015-02-20 Howard Butler <howard@hobu.co> * config.guess config.sub: #257 update very old config.guess and config.sub @@ -19,6 +19,8 @@ o Fix NaN handling by geod_inverse and geod_polygon_addedge #251 & #253 o Update config.sub and config.guess #257 + + o Adapt Charles Karney's CMake patches for smoother build #258 4.9.0 Release Notes ------------------- diff --git a/cmake/Proj4Mac.cmake b/cmake/Proj4Mac.cmake index 2f09fa23..c2448e7b 100644 --- a/cmake/Proj4Mac.cmake +++ b/cmake/Proj4Mac.cmake @@ -16,7 +16,7 @@ set(PROJ_RESOURCES "" ) if(APPLE) option(BUILD_FRAMEWORKS_AND_BUNDLE "if set to ON, build a library framework and application bundle, - otherwise install classical UNIX bin/lib" ON ) + otherwise install classical UNIX bin/lib" OFF ) set(DEFAULT_BINDIR ${BUNDLEDIR}) boost_report_value(BUNDLEDIR) boost_report_value(PROJ_INSTALL_NAME_DIR) diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt new file mode 100644 index 00000000..bf47b16f --- /dev/null +++ b/man/CMakeLists.txt @@ -0,0 +1,6 @@ +install (FILES man1/proj.1 man1/cs2cs.1 man1/geod.1 + DESTINATION share/man/man1) + +install (FILES man3/pj_init.3 man3/geodesic.3 + DESTINATION share/man/man3) + diff --git a/src/bin_cs2cs.cmake b/src/bin_cs2cs.cmake index 00f177a3..59e57adc 100644 --- a/src/bin_cs2cs.cmake +++ b/src/bin_cs2cs.cmake @@ -9,6 +9,6 @@ if(WIN32) endif(WIN32) add_executable(cs2cs ${CS2CS_SRC} ${CS2CS_INCLUDE}) -target_link_libraries(cs2cs proj m) +target_link_libraries(cs2cs ${PROJ_LIBRARIES}) install(TARGETS cs2cs RUNTIME DESTINATION ${BINDIR}) diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index c6424efb..06b43e37 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -204,7 +204,7 @@ set(HEADERS_LIBPROJ emess.h projects.h proj_api.h - proj_config.h + ${CMAKE_CURRENT_BINARY_DIR}/proj_config.h ) # Group source files for IDE source explorers (e.g. Visual Studio) @@ -259,7 +259,7 @@ if(WIN32) set_target_properties(${PROJ_CORE_TARGET} PROPERTIES OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}" - VERSION ${ ${PROJECT_INTERN_NAME}_VERSION } + VERSION ${${PROJECT_INTERN_NAME}_VERSION } CLEAN_DIRECT_OUTPUT 1) elseif(BUILD_FRAMEWORKS_AND_BUNDLE) set_target_properties(${PROJ_CORE_TARGET} |