-librt is still need...
This commit is contained in:
@@ -247,7 +247,6 @@ if(PIP_MATH_YN)
|
|||||||
add_definitions(-DPIP_MATH_YN)
|
add_definitions(-DPIP_MATH_YN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Check if build debug version
|
# Check if build debug version
|
||||||
if (PIP_BUILD_DEBUG)
|
if (PIP_BUILD_DEBUG)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
|
||||||
@@ -316,23 +315,28 @@ if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
|
|||||||
#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
|
#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
|
||||||
#message("${ANDROID_NDK}/sysroot/usr/include")
|
#message("${ANDROID_NDK}/sysroot/usr/include")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT PIP_FREERTOS)
|
if(NOT PIP_FREERTOS)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
if(${C_COMPILER} STREQUAL "cl.exe")
|
if(${C_COMPILER} STREQUAL "cl.exe")
|
||||||
|
else()
|
||||||
|
list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi cfgmgr32 setupapi)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi cfgmgr32 setupapi)
|
list(APPEND LIBS_MAIN dl)
|
||||||
endif()
|
if(DEFINED ENV{QNX_HOST})
|
||||||
else()
|
list(APPEND LIBS_MAIN socket)
|
||||||
list(APPEND LIBS_MAIN dl)
|
else()
|
||||||
if(DEFINED ENV{QNX_HOST})
|
if (NOT DEFINED ANDROID_PLATFORM)
|
||||||
list(APPEND LIBS_MAIN socket)
|
list(APPEND LIBS_MAIN pthread util)
|
||||||
else()
|
else()
|
||||||
if (NOT DEFINED ANDROID_PLATFORM)
|
if (NOT APPLE)
|
||||||
list(APPEND LIBS_MAIN pthread util)
|
list(APPEND LIBS_MAIN rt)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
set(PIP_LIBS)
|
set(PIP_LIBS)
|
||||||
if(PIP_FREERTOS)
|
if(PIP_FREERTOS)
|
||||||
set(PIP_LIBS ${LIBS_MAIN})
|
set(PIP_LIBS ${LIBS_MAIN})
|
||||||
|
|||||||
@@ -67,6 +67,10 @@ if (NOT BUILDING_PIP)
|
|||||||
find_library(PTHREAD_LIBRARY pthread)
|
find_library(PTHREAD_LIBRARY pthread)
|
||||||
find_library(UTIL_LIBRARY util)
|
find_library(UTIL_LIBRARY util)
|
||||||
set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
|
set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
|
||||||
|
if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_FREERTOS))
|
||||||
|
find_library(RT_LIBRARY rt)
|
||||||
|
list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY})
|
||||||
|
endif()
|
||||||
list(APPEND PIP_LIBRARY ${_PIP_ADD_LIBS_})
|
list(APPEND PIP_LIBRARY ${_PIP_ADD_LIBS_})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user