Skip to content

Commit c6779b1

Browse files
committed
Reorder lslobj cmake commands for slightly more logical grouping.
1 parent d453e75 commit c6779b1

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
@@ -33,10 +33,22 @@ if(UNIX AND NOT APPLE)
3333
endif()
3434
elseif(WIN32)
3535
target_link_libraries(lslobj PRIVATE iphlpapi winmm mswsock ws2_32)
36+
endif()
37+
38+
# Compiler settings
39+
target_compile_definitions(lslobj
40+
PRIVATE
41+
LIBLSL_EXPORTS
42+
LOGURU_DEBUG_LOGGING=$<BOOL:${LSL_DEBUGLOG}>
43+
PUBLIC
44+
ASIO_NO_DEPRECATED
45+
$<$<CXX_COMPILER_ID:MSVC>:LSLNOAUTOLINK> # don't use #pragma(lib) in CMake builds
46+
)
47+
if(WIN32)
3648
target_compile_definitions(lslobj
37-
PRIVATE
49+
PRIVATE
3850
_CRT_SECURE_NO_WARNINGS
39-
PUBLIC
51+
PUBLIC
4052
_WIN32_WINNT=${LSL_WINVER}
4153
)
4254
if(BUILD_SHARED_LIBS)

0 commit comments

Comments
 (0)