diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-21 03:34:41 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-21 03:34:41 +0000 |
| commit | bd47d2fd5f7d0ca7765a48b09d14145164b88bc2 (patch) | |
| tree | f3dc03519365aadc21841de9143e26ca94dcbdc9 /src | |
| parent | 5ec17d0d7cddf53c0fc29f00b08941e907be044c (diff) | |
| download | PROJ-bd47d2fd5f7d0ca7765a48b09d14145164b88bc2.tar.gz PROJ-bd47d2fd5f7d0ca7765a48b09d14145164b88bc2.zip | |
adapt Charles Karney's patches for smoother CMake #258
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2614 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin_cs2cs.cmake | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
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} |