gcontini
2019-11-30 806b1356e99ec4f51b32c567c720e7f6154203c9
add pthread to external libs
1个文件已修改
1个文件已添加
1个文件已删除
24 ■■■■ 已修改文件
CMakeLists.txt 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
extern/license-generator 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
extern/license-generator 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CMakeLists.txt
@@ -62,15 +62,15 @@
    find_package(OpenSSL REQUIRED COMPONENTS Crypto)
    include_directories(${OPENSSL_INCLUDE_DIR})
    #list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
    #find_package(Threads)
    #if(THREADS_HAVE_PTHREAD_ARG)
      #    list(APPEND EXTERNAL_LIBS "-pthread")
    #else(THREADS_HAVE_PTHREAD_ARG)
    #    if(CMAKE_THREAD_LIBS_INIT)
      #         list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
    #    endif()
    #endif(THREADS_HAVE_PTHREAD_ARG)
    MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
    find_package(Threads)
    if(THREADS_HAVE_PTHREAD_ARG)
          list(APPEND EXTERNAL_LIBS "-pthread")
    else(THREADS_HAVE_PTHREAD_ARG)
        if(CMAKE_THREAD_LIBS_INIT)
               list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
        endif()
    endif(THREADS_HAVE_PTHREAD_ARG)
    #Zlib required when openssl version < 1.0.1f
    #SET ( ZLIB_USE_STATIC_LIBS ON )
    #find_package(ZLIB REQUIRED)
@@ -84,9 +84,9 @@
        include_directories(${DBUS_ARCH_INCLUDE_DIR})
        list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
    endif(USE_DBUS_IDENTIFIER)    
    if(NOT MINGW)
         list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS})
    endif(NOT MINGW)
    #if(NOT MINGW)
     #    list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS})
    #endif(NOT MINGW)
endif(UNIX)
#initialize project
extern/license-generator
File was deleted
extern/license-generator
New file
@@ -0,0 +1 @@
../../olm-license-generator/