diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-17 16:32:42 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-17 16:32:42 +0000 |
| commit | 3e6f53a7a90b6e2eec59f78c36ddb87e693c55b9 (patch) | |
| tree | e58f7e1f497febdf5e76b246983be1acbf5296b0 | |
| parent | 9c936decfcb7794e00ab9fdbc0d298dc0eae5cfc (diff) | |
| download | PROJ-3e6f53a7a90b6e2eec59f78c36ddb87e693c55b9.tar.gz PROJ-3e6f53a7a90b6e2eec59f78c36ddb87e693c55b9.zip | |
apply #248 for CMake healpix compilation typo
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2607 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 17 |
3 files changed, 14 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 82df1707..f74a83c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ colormsg(_HIBLUE_ "Configuring PROJ:") #PROJ version information ################################################################################# include(Proj4Version) -proj_version(MAJOR 4 MINOR 8 PATCH 0) +proj_version(MAJOR 4 MINOR 9 PATCH 1) ################################################################################# # Build features and variants @@ -1,6 +1,5 @@ -2015-02-16 Howard Butler <howard@hobu.co> - * src/PJ_aitoff.c: New Winkel Tripel Inverse #250 - from Drazen Tutic +2015-02-17 Howard Butler <howard@hobu.co> + * src/lib_proj.cmake CMakeLists: Fix #248 healpix compilation typo 2015-02-16 Howard Butler <howard@hobu.co> * src/pj_init.c: Fix #237 warning about initialization diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 0973c8c2..d56f77d3 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -24,12 +24,12 @@ if(NOT USE_THREAD) add_definitions( -DMUTEX_stub) endif(NOT USE_THREAD) find_package(Threads QUIET) -if(Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) +if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) add_definitions( -DMUTEX_win32) -endif(Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) -if(Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) +endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) +if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) add_definitions( -DMUTEX_pthread) -endif(Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) +endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) if(USE_THREAD AND NOT Threads_FOUND) message(FATAL_ERROR "No thread library found and thread/mutex support is required by USE_THREAD option") endif(USE_THREAD AND NOT Threads_FOUND) @@ -170,7 +170,7 @@ SET(SRC_LIBPROJ_CORE pj_gridcatalog.c pj_gridinfo.c pj_gridlist.c - pj_healpix.c + PJ_healpix.c pj_init.c pj_initcache.c pj_inv.c @@ -283,8 +283,13 @@ add_dependencies(${PROJ_CORE_TARGET} proj_config.h) ############################################## set(PROJ_LIBRARIES ${PROJ_CORE_TARGET} ) if(UNIX AND BUILD_LIBPROJ_SHARED) - set(PROJ_LIBRARIES ${PROJ_LIBRARIES} m) + find_library(M_LIB m) + TARGET_LINK_LIBRARIES(${PROJ_CORE_TARGET} ${M_LIB}) endif(UNIX AND BUILD_LIBPROJ_SHARED) +if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT AND BUILD_LIBPROJ_SHARED) + TARGET_LINK_LIBRARIES(${PROJ_CORE_TARGET} ${CMAKE_THREAD_LIBS_INIT}) +endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT AND BUILD_LIBPROJ_SHARED) + ############################################## # install |