aboutsummaryrefslogtreecommitdiff
path: root/src/lib_proj.cmake
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2015-07-07 18:46:36 +0200
committerEven Rouault <even.rouault@spatialys.com>2015-07-07 18:46:36 +0200
commit2b5b97942016c2f18a0992b934d1b6b460391dac (patch)
tree46cffbdad4a652422cc94f6077e3ab3955e6dc0f /src/lib_proj.cmake
parent396afc3312243ff4a8e95c3b9398d56c5582e30d (diff)
downloadPROJ-2b5b97942016c2f18a0992b934d1b6b460391dac.tar.gz
PROJ-2b5b97942016c2f18a0992b934d1b6b460391dac.zip
Make pj_init() locale safe and no longer modify locale (#226)
Remove setlocale() use in pj_init_ctx(), and replace uses of atof() & strtod() by their locale safe variants pj_atof() and pj_strtod(). Proj versions from now advertize #define PJ_LOCALE_SAFE 1 in proj_api.h and export pj_atof() & pj_strtod()
Diffstat (limited to 'src/lib_proj.cmake')
-rw-r--r--src/lib_proj.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index 8111c7aa..8a6349d8 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -200,6 +200,7 @@ SET(SRC_LIBPROJ_CORE
proj_rouss.c
rtodms.c
vector1.c
+ pj_strtod.c
${CMAKE_CURRENT_BINARY_DIR}/proj_config.h
)
@@ -213,6 +214,7 @@ set(HEADERS_LIBPROJ
source_group("Header Files" FILES ${HEADERS_LIBPROJ})
source_group("Source Files\\Core" FILES ${SRC_LIBPROJ_CORE})
source_group("Source Files\\PJ" FILES ${SRC_LIBPROJ_PJ})
+include_directories( ${CMAKE_CURRENT_BINARY_DIR})
source_group("CMake Files" FILES CMakeLists.txt)