[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r7630 - trunk/Utilities/OWS
From:       svn_fdo () osgeo ! org
Date:       2018-01-28 7:20:31
Message-ID: 20180128072031.241F63900D6 () trac ! osgeo ! org
[Download RAW message or body]

Author: jng
Date: 2018-01-27 23:20:30 -0800 (Sat, 27 Jan 2018)
New Revision: 7630

Modified:
   trunk/Utilities/OWS/CMakeLists.txt
Log:
#940: OWS: Ensure rt is linked and use -pthread over linking pthread library

Modified: trunk/Utilities/OWS/CMakeLists.txt
===================================================================
--- trunk/Utilities/OWS/CMakeLists.txt	2018-01-27 17:43:13 UTC (rev 7629)
+++ trunk/Utilities/OWS/CMakeLists.txt	2018-01-28 07:20:30 UTC (rev 7630)
@@ -13,6 +13,10 @@
     include_directories( ${FDOTHIRDPARTY}/libcurl/include )
 endif( LOCAL_CURL )
 
+if (CMAKE_COMPILER_IS_GNUCXX)
+    add_definitions(-pthread)
+endif (CMAKE_COMPILER_IS_GNUCXX)
+
 set( FdoOwsSrc_SRCS
     Src/FdoOwsCapabilities.cpp
     Src/FdoOwsRequest.cpp
@@ -34,7 +38,6 @@
     Src/FdoOwsServiceProvider.cpp
 )
 
-
 set( FdoOws_LIB_SRCS
     ${FdoOwsSrc_SRCS}
 )
@@ -55,8 +58,8 @@
     ${CURL_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${ZLIB_LIBRARIES}
-    pthread
+    rt
 )
 
 install( TARGETS OWS${FDO_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT \
                ${FDO_COMPONENT} )
-install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libOWS${FDO_VERSION_SUFFIX}.so \
libOWS.so COMPONENT ${FDO_COMPONENT} ) \ No newline at end of file
+install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libOWS${FDO_VERSION_SUFFIX}.so \
libOWS.so COMPONENT ${FDO_COMPONENT} )

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]