Explorar el Código

Merge pull request #6385 from richardkchapman/apr-library-paths

HPCC-12139 Spurious Warnings concerning -L libaprlib.dylib on OSX

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday hace 10 años
padre
commit
c38193b1a0
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      cmake_modules/commonSetup.cmake

+ 2 - 2
cmake_modules/commonSetup.cmake

@@ -640,13 +640,13 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
         if (APR_FOUND)
           add_definitions (-D_USE_APR)
           include_directories(${APR_INCLUDE_DIR})
-          link_directories(${APR_LIBRARIES})
+          link_directories(${APR_LIBRARY_DIR})
         else()
           message(FATAL_ERROR "APR requested but package not found")
         endif()
         if (APRUTIL_FOUND)
           include_directories(${APRUTIL_INCLUDE_DIR})
-          link_directories(${APRUTIL_LIBRARIES})
+          link_directories(${APRUTIL_LIBRARY_DIR})
         else()
           message(FATAL_ERROR "APRUTIL requested but package not found")
         endif()