Skip to content

Commit ca33d49

Browse files
authored
[build][cmake] set lib m as public so it can be linked by consumer (#5193)
* [build][cmake] set lib m as public so it can be linked by consumer * [build][cmake] removed redundancy when BSD systems
1 parent 085391e commit ca33d49

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

cmake/LibraryConfigurations.cmake

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,22 @@ if (${PLATFORM} MATCHES "Desktop")
3838
find_library(OSS_LIBRARY ossaudio)
3939
endif ()
4040

41-
set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
41+
set(LIBS_PRIVATE pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
42+
set(LIBS_PUBLIC m)
4243
else ()
4344
find_library(pthread NAMES pthread)
4445
find_package(OpenGL QUIET)
4546
if ("${OPENGL_LIBRARIES}" STREQUAL "")
4647
set(OPENGL_LIBRARIES "GL")
4748
endif ()
4849

49-
set(LIBS_PRIVATE m atomic pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
50+
set(LIBS_PRIVATE pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
51+
set(LIBS_PUBLIC m)
5052

5153
if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD")
5254
find_library(OSS_LIBRARY ossaudio)
53-
set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
55+
else ()
56+
set(LIBS_PRIVATE ${LIBS_PRIVATE} atomic)
5457
endif ()
5558

5659
if (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD" AND USE_AUDIO)
@@ -82,7 +85,8 @@ elseif (${PLATFORM} MATCHES "Android")
8285
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libatomic.a -Wl,--build-id -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel -Wl,--fatal-warnings -u ANativeActivity_onCreate -Wl,-undefined,dynamic_lookup")
8386

8487
find_library(OPENGL_LIBRARY OpenGL)
85-
set(LIBS_PRIVATE m log android EGL GLESv2 OpenSLES atomic c)
88+
set(LIBS_PRIVATE log android EGL GLESv2 OpenSLES atomic c)
89+
set(LIBS_PUBLIC m)
8690

8791
elseif ("${PLATFORM}" MATCHES "DRM")
8892
set(PLATFORM_CPP "PLATFORM_DRM")
@@ -100,7 +104,8 @@ elseif ("${PLATFORM}" MATCHES "DRM")
100104
if (NOT CMAKE_CROSSCOMPILING OR NOT CMAKE_SYSROOT)
101105
include_directories(/usr/include/libdrm)
102106
endif ()
103-
set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread m dl)
107+
set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread dl)
108+
set(LIBS_PUBLIC m)
104109

105110
elseif ("${PLATFORM}" MATCHES "SDL")
106111
# First, check if SDL is included as a subdirectory

0 commit comments

Comments
 (0)