diff options
| author | Howard Butler <howard@hobu.co> | 2016-01-06 12:32:51 -0600 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2016-01-06 12:32:51 -0600 |
| commit | 12068d33035efaf205f9d3e3f31b45adedb320a7 (patch) | |
| tree | 1d077c30bbfe0e507ac19d80e2b2df680372c739 /src | |
| parent | 9327ac6f13590e2f4247020e70ec2940d304bb69 (diff) | |
| download | PROJ-12068d33035efaf205f9d3e3f31b45adedb320a7.tar.gz PROJ-12068d33035efaf205f9d3e3f31b45adedb320a7.zip | |
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) ############################################## |