Skip to content

Commit 8ca5b87

Browse files
committed
Fix some cmake errors that snuck in during rebase.
1 parent 2c907ff commit 8ca5b87

File tree

3 files changed

+4
-25
lines changed

3 files changed

+4
-25
lines changed

.github/workflows/cppcmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# - {name: "ubuntu-24.04", os: "ubuntu-24.04", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
4040
# - {name: "windows-x64", os: "windows-latest", cmake_extra: "-T v142,host=x86"}
4141
# - {name: "windows-32", os: "windows-latest", cmake_extra: "-T v142,host=x86 -A Win32"}
42-
- {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DLSL_FRAMEWORK=ON" }
42+
- {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" -DLSL_FRAMEWORK=ON" }
4343

4444
steps:
4545
- uses: actions/checkout@v4

cmake/Installation.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ write_basic_package_version_file(
3636

3737
# Define installation targets
3838
set(LSLTargets lsl)
39+
if(LSL_BUILD_STATIC)
40+
list(APPEND LSLTargets lslobj lslboost)
41+
endif()
3942

4043
# Install the targets and store configuration information.
4144
install(TARGETS ${LSLTargets}

cmake/TargetObjLib.cmake

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,30 +59,6 @@ if(WIN32)
5959
endif(BUILD_SHARED_LIBS)
6060
endif()
6161

62-
# Compiler settings
63-
target_compile_definitions(lslobj
64-
PRIVATE
65-
LIBLSL_EXPORTS
66-
LOGURU_DEBUG_LOGGING=$<BOOL:${LSL_DEBUGLOG}>
67-
PUBLIC
68-
ASIO_NO_DEPRECATED
69-
$<$<CXX_COMPILER_ID:MSVC>:LSLNOAUTOLINK> # don't use #pragma(lib) in CMake builds
70-
)
71-
if(WIN32)
72-
target_compile_definitions(lslobj
73-
PRIVATE
74-
_CRT_SECURE_NO_WARNINGS
75-
PUBLIC
76-
_WIN32_WINNT=${LSL_WINVER}
77-
)
78-
if(BUILD_SHARED_LIBS)
79-
# set_target_properties(lslobj
80-
# PROPERTIES
81-
# WINDOWS_EXPORT_ALL_SYMBOLS ON
82-
# )
83-
endif(BUILD_SHARED_LIBS)
84-
endif(WIN32)
85-
8662
# Link in 3rd party dependencies
8763
# - loguru and asio header-only
8864
target_include_directories(lslobj

0 commit comments

Comments
 (0)