Skip to content

Commit 8be8c61

Browse files
authored
Merge pull request #20 from OPENSPHERE-Inc/macos-fix
CI fix for MacOS
2 parents fdd9c6e + 19f9125 commit 8be8c61

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

CMakeLists.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ target_include_directories(
110110
PRIVATE ${CMAKE_SOURCE_DIR}/lib/o2/src ${CMAKE_SOURCE_DIR}/shared/properties-view
111111
${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area ${CMAKE_SOURCE_DIR}/shared/qt/wrappers)
112112

113-
set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
114-
115113
if(NOT buildspec)
116114
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/buildspec.json" buildspec)
117115
endif()
@@ -124,26 +122,30 @@ string(
124122
qt6
125123
version)
126124

127-
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
125+
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
128126
install(
129-
FILES "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/bin/Qt6WebSockets.dll"
127+
DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/lib/QtWebSockets.framework"
130128
CONFIGURATIONS RelWithDebInfo Debug Release
131-
DESTINATION bin/64bit
129+
DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
132130
OPTIONAL)
133131
install(
134-
DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/plugins/tls"
132+
DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/plugins/tls"
135133
CONFIGURATIONS RelWithDebInfo Debug Release
136-
DESTINATION bin/64bit
134+
DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
137135
OPTIONAL)
138-
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
136+
endif()
137+
138+
set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
139+
140+
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
139141
install(
140-
DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/lib/QtWebSockets.framework"
142+
FILES "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/bin/Qt6WebSockets.dll"
141143
CONFIGURATIONS RelWithDebInfo Debug Release
142-
DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
144+
DESTINATION bin/64bit
143145
OPTIONAL)
144146
install(
145-
DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-universal/plugins/tls"
147+
DIRECTORY "${CMAKE_SOURCE_DIR}/.deps/obs-deps-qt6-${qtversion}-x64/plugins/tls"
146148
CONFIGURATIONS RelWithDebInfo Debug Release
147-
DESTINATION "${CMAKE_PROJECT_NAME}.plugin/Contents/Frameworks"
149+
DESTINATION bin/64bit
148150
OPTIONAL)
149151
endif()

0 commit comments

Comments
 (0)