From 12068d33035efaf205f9d3e3f31b45adedb320a7 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 6 Jan 2016 12:32:51 -0600 Subject: adapt patch for #325 to fix static-only library building --- src/lib_proj.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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) ############################################## -- cgit v1.2.3