From ccf6b810b5125ac117a81d0f34fbe7742104c4d8 Mon Sep 17 00:00:00 2001 From: peri4 Date: Tue, 30 Jul 2024 14:41:54 +0300 Subject: [PATCH] -librt is still need... --- CMakeLists.txt | 30 +++++++++++++++++------------- cmake/FindPIP.cmake | 4 ++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6160f0b..8be2a1fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,7 +247,6 @@ if(PIP_MATH_YN) add_definitions(-DPIP_MATH_YN) endif() - # Check if build debug version if (PIP_BUILD_DEBUG) 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_NDK}/sysroot/usr/include") endif() + if(NOT PIP_FREERTOS) -if(WIN32) - if(${C_COMPILER} STREQUAL "cl.exe") + if(WIN32) + if(${C_COMPILER} STREQUAL "cl.exe") + else() + list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi cfgmgr32 setupapi) + endif() else() - list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi cfgmgr32 setupapi) - endif() -else() - list(APPEND LIBS_MAIN dl) - if(DEFINED ENV{QNX_HOST}) - list(APPEND LIBS_MAIN socket) - else() - if (NOT DEFINED ANDROID_PLATFORM) - list(APPEND LIBS_MAIN pthread util) + list(APPEND LIBS_MAIN dl) + if(DEFINED ENV{QNX_HOST}) + list(APPEND LIBS_MAIN socket) + else() + if (NOT DEFINED ANDROID_PLATFORM) + list(APPEND LIBS_MAIN pthread util) + else() + if (NOT APPLE) + list(APPEND LIBS_MAIN rt) + endif() + endif() endif() endif() endif() -endif() set(PIP_LIBS) if(PIP_FREERTOS) set(PIP_LIBS ${LIBS_MAIN}) diff --git a/cmake/FindPIP.cmake b/cmake/FindPIP.cmake index 7f2acca4..87d2178d 100644 --- a/cmake/FindPIP.cmake +++ b/cmake/FindPIP.cmake @@ -67,6 +67,10 @@ if (NOT BUILDING_PIP) find_library(PTHREAD_LIBRARY pthread) find_library(UTIL_LIBRARY util) 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_}) endif() endif()