|
| 1 | +--- a/CMakeLists.txt |
| 2 | ++++ b/CMakeLists.txt |
| 3 | +@@ -83,8 +83,9 @@ IF(USE_CURL) |
| 4 | + ENDIF() |
| 5 | + |
| 6 | + IF(USE_PTHREADS) |
| 7 | ++ SET(CMAKE_THREAD_PREFER_PTHREAD TRUE) |
| 8 | ++ SET(THREADS_PREFER_PTHREAD_FLAG TRUE) |
| 9 | + FIND_PACKAGE(Threads REQUIRED) |
| 10 | +- ADD_DEFINITIONS(-D_REENTRANT) |
| 11 | + ENDIF(USE_PTHREADS) |
| 12 | + |
| 13 | + IF(USE_BZIP2) |
| 14 | +@@ -100,19 +101,13 @@ ELSE() |
| 15 | + ENDIF() |
| 16 | + |
| 17 | + # Support for remote file drivers is not implemented for native Windows: |
| 18 | +-IF (NOT MSVC) |
| 19 | ++IF (NOT WIN32) |
| 20 | + |
| 21 | + # Find library needed for gethostbyname: |
| 22 | +- CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) |
| 23 | +- IF (NOT CMAKE_HAVE_GETHOSTBYNAME) |
| 24 | +- CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_HAVE_GETHOSTBYNAME) |
| 25 | +- ENDIF () |
| 26 | ++ CHECK_SYMBOL_EXISTS(gethostbyname "netdb.h" CMAKE_HAVE_GETHOSTBYNAME) |
| 27 | + |
| 28 | + # Find library needed for connect: |
| 29 | +- CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) |
| 30 | +- IF (NOT CMAKE_HAVE_CONNECT) |
| 31 | +- CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_HAVE_CONNECT) |
| 32 | +- ENDIF () |
| 33 | ++ CHECK_SYMBOL_EXISTS(connect "sys/types.h;sys/socket.h" CMAKE_HAVE_CONNECT) |
| 34 | + |
| 35 | + # Define HAVE_NET_SERVICES if gethostbyname & connect were found: |
| 36 | + IF (CMAKE_HAVE_GETHOSTBYNAME AND CMAKE_HAVE_CONNECT) |
| 37 | +@@ -258,28 +253,30 @@ TARGET_INCLUDE_DIRECTORIES(${LIB_NAME} PUBLIC |
| 38 | + TARGET_LINK_LIBRARIES(${LIB_NAME} ${M_LIB}) |
| 39 | + # zlib: |
| 40 | + IF (ZLIB_FOUND) |
| 41 | +- TARGET_INCLUDE_DIRECTORIES(${LIB_NAME} PUBLIC ${ZLIB_INCLUDE_DIR}) |
| 42 | +- TARGET_LINK_LIBRARIES(${LIB_NAME} ${ZLIB_LIBRARIES}) |
| 43 | ++ TARGET_LINK_LIBRARIES(${LIB_NAME} ZLIB::ZLIB) |
| 44 | + # For cfitsio.pc.cmake: |
| 45 | + SET (PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -lz") |
| 46 | + ENDIF(ZLIB_FOUND) |
| 47 | + # cURL: |
| 48 | +-IF (CURL_FOUND) |
| 49 | +- TARGET_INCLUDE_DIRECTORIES(${LIB_NAME} PUBLIC ${CURL_INCLUDE_DIRS}) |
| 50 | +- TARGET_LINK_LIBRARIES(${LIB_NAME} ${CURL_LIBRARIES}) |
| 51 | ++IF (USE_CURL) |
| 52 | ++ TARGET_LINK_LIBRARIES(${LIB_NAME} CURL::libcurl) |
| 53 | + # For cfitsio.pc.cmake: |
| 54 | + SET (PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -lcurl") |
| 55 | +-ENDIF(CURL_FOUND) |
| 56 | ++ENDIF() |
| 57 | + # PThreads: |
| 58 | +-IF (THREADS_FOUND) |
| 59 | ++IF (USE_PTHREADS) |
| 60 | ++ IF(CMAKE_USE_PTHREADS_INIT) |
| 61 | + TARGET_LINK_LIBRARIES(${LIB_NAME} Threads::Threads) |
| 62 | +-ENDIF(THREADS_FOUND) |
| 63 | ++ ELSE() |
| 64 | ++ find_package(pthreads4w REQUIRED CONFIG) |
| 65 | ++ TARGET_LINK_LIBRARIES(${LIB_NAME} pthreads4w::pthreads4w) |
| 66 | ++ ENDIF() |
| 67 | ++ENDIF() |
| 68 | + # BZip2: |
| 69 | +-IF (BZIP2_FOUND) |
| 70 | +- TARGET_INCLUDE_DIRECTORIES(${LIB_NAME} PUBLIC ${BZIP2_INCLUDE_DIRS}) |
| 71 | +- TARGET_LINK_LIBRARIES(${LIB_NAME} ${BZIP2_LIBRARIES}) |
| 72 | ++IF (USE_BZIP2) |
| 73 | ++ TARGET_LINK_LIBRARIES(${LIB_NAME} BZip2::BZip2) |
| 74 | + SET (PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -lbz2") |
| 75 | +-ENDIF(BZIP2_FOUND) |
| 76 | ++ENDIF() |
| 77 | + |
| 78 | + #============================================================================== |
| 79 | + |
0 commit comments