diff options
| author | Howard Butler <howard@hobu.co> | 2016-02-24 10:32:07 +0100 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2016-02-24 10:32:07 +0100 |
| commit | c1bd0a02afc0959bab0faa0f5722345e436ae731 (patch) | |
| tree | 6319beba208544fbb1c1fb1b9c410d85c2cc1c26 /src | |
| parent | 901539f60eab08bbf7f16a48ed2967cba9d3d5cc (diff) | |
| parent | 12068d33035efaf205f9d3e3f31b45adedb320a7 (diff) | |
| download | PROJ-c1bd0a02afc0959bab0faa0f5722345e436ae731.tar.gz PROJ-c1bd0a02afc0959bab0faa0f5722345e436ae731.zip | |
Merge pull request #343 from OSGeo/cmake-shared-325
adapt patch for #325 to fix static-only library building
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib_proj.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index b7b497cc..47cd8078 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -294,15 +294,15 @@ set_target_properties(${PROJ_CORE_TARGET} # Link properties ############################################## set(PROJ_LIBRARIES ${PROJ_CORE_TARGET} ) -if(UNIX AND BUILD_LIBPROJ_SHARED) +if(UNIX) find_library(M_LIB m) if(M_LIB) TARGET_LINK_LIBRARIES(${PROJ_CORE_TARGET} -lm) endif() -endif(UNIX AND BUILD_LIBPROJ_SHARED) -if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT AND BUILD_LIBPROJ_SHARED) +endif(UNIX) +if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) 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) +endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) ############################################## |