Skip to content

Commit 60789a5

Browse files
committed
Reorder lslobj cmake commands for slightly more logical grouping.
1 parent 4a092b3 commit 60789a5

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

cmake/TargetObjLib.cmake

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,22 @@ if(UNIX AND NOT APPLE)
4343
endif()
4444
elseif(WIN32)
4545
target_link_libraries(lslobj PRIVATE iphlpapi winmm mswsock ws2_32)
46+
endif()
47+
48+
# Compiler settings
49+
target_compile_definitions(lslobj
50+
PRIVATE
51+
LIBLSL_EXPORTS
52+
LOGURU_DEBUG_LOGGING=$<BOOL:${LSL_DEBUGLOG}>
53+
PUBLIC
54+
ASIO_NO_DEPRECATED
55+
$<$<CXX_COMPILER_ID:MSVC>:LSLNOAUTOLINK> # don't use #pragma(lib) in CMake builds
56+
)
57+
if(WIN32)
4658
target_compile_definitions(lslobj
47-
PRIVATE
59+
PRIVATE
4860
_CRT_SECURE_NO_WARNINGS
49-
PUBLIC
61+
PUBLIC
5062
_WIN32_WINNT=${LSL_WINVER}
5163
)
5264
if(BUILD_SHARED_LIBS)

0 commit comments

Comments
 (0)