aboutsummaryrefslogtreecommitdiff
path: root/src/lib_proj.cmake
diff options
context:
space:
mode:
authorHoward Butler <howard@hobu.co>2015-02-21 03:34:41 +0000
committerHoward Butler <howard@hobu.co>2015-02-21 03:34:41 +0000
commitbd47d2fd5f7d0ca7765a48b09d14145164b88bc2 (patch)
treef3dc03519365aadc21841de9143e26ca94dcbdc9 /src/lib_proj.cmake
parent5ec17d0d7cddf53c0fc29f00b08941e907be044c (diff)
downloadPROJ-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/lib_proj.cmake')
-rw-r--r--src/lib_proj.cmake4
1 files changed, 2 insertions, 2 deletions
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}