Skip to content

Commit c8b7a41

Browse files
committed
examples の sdl_sample と messaging_recvonly_sample に Windows 向け CMake 設定を追加する
Windows で Boost の静的ランタイムライブラリを正しくリンクするため、 以下の設定を追加: - Boost_USE_STATIC_RUNTIME ON - MSVC_RUNTIME_LIBRARY の設定 - コンパイルオプションの Windows/非 Windows 分岐
1 parent b88a4da commit c8b7a41

File tree

2 files changed

+32
-10
lines changed

2 files changed

+32
-10
lines changed

examples/messaging_recvonly_sample/CMakeLists.txt

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ list(APPEND CMAKE_PREFIX_PATH ${SORA_DIR})
1818
list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake)
1919

2020
set(Boost_USE_STATIC_LIBS ON)
21+
if(WIN32)
22+
set(Boost_USE_STATIC_RUNTIME ON)
23+
endif()
2124

2225
find_package(Boost REQUIRED COMPONENTS json filesystem)
2326
find_package(WebRTC REQUIRED)
@@ -30,11 +33,19 @@ set_target_properties(messaging_recvonly_sample PROPERTIES POSITION_INDEPENDENT_
3033
set_target_properties(messaging_recvonly_sample PROPERTIES CXX_VISIBILITY_PRESET hidden)
3134
target_sources(messaging_recvonly_sample PRIVATE src/messaging_recvonly_sample.cpp)
3235

33-
target_compile_options(messaging_recvonly_sample
34-
PRIVATE
35-
"$<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>"
36-
"$<$<COMPILE_LANGUAGE:CXX>:-isystem${LIBCXX_INCLUDE_DIR}>"
37-
)
36+
if(NOT WIN32)
37+
target_compile_options(messaging_recvonly_sample
38+
PRIVATE
39+
"$<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>"
40+
"$<$<COMPILE_LANGUAGE:CXX>:-isystem${LIBCXX_INCLUDE_DIR}>"
41+
)
42+
else()
43+
target_compile_options(messaging_recvonly_sample PRIVATE /utf-8)
44+
set_target_properties(messaging_recvonly_sample
45+
PROPERTIES
46+
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
47+
)
48+
endif()
3849
target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include)
3950
target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora)
4051
target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0)

examples/sdl_sample/CMakeLists.txt

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ list(APPEND CMAKE_PREFIX_PATH ${SORA_DIR} ${SDL3_DIR})
1919
list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake)
2020

2121
set(Boost_USE_STATIC_LIBS ON)
22+
if(WIN32)
23+
set(Boost_USE_STATIC_RUNTIME ON)
24+
endif()
2225

2326
find_package(Boost REQUIRED COMPONENTS json filesystem)
2427
find_package(WebRTC REQUIRED)
@@ -32,11 +35,19 @@ set_target_properties(sdl_sample PROPERTIES POSITION_INDEPENDENT_CODE ON)
3235
set_target_properties(sdl_sample PROPERTIES CXX_VISIBILITY_PRESET hidden)
3336
target_sources(sdl_sample PRIVATE src/sdl_sample.cpp src/sdl_renderer.cpp)
3437

35-
target_compile_options(sdl_sample
36-
PRIVATE
37-
"$<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>"
38-
"$<$<COMPILE_LANGUAGE:CXX>:-isystem${LIBCXX_INCLUDE_DIR}>"
39-
)
38+
if(NOT WIN32)
39+
target_compile_options(sdl_sample
40+
PRIVATE
41+
"$<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>"
42+
"$<$<COMPILE_LANGUAGE:CXX>:-isystem${LIBCXX_INCLUDE_DIR}>"
43+
)
44+
else()
45+
target_compile_options(sdl_sample PRIVATE /utf-8)
46+
set_target_properties(sdl_sample
47+
PROPERTIES
48+
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
49+
)
50+
endif()
4051
target_include_directories(sdl_sample PRIVATE ${CLI11_DIR}/include)
4152
target_link_libraries(sdl_sample PRIVATE Sora::sora SDL3::SDL3)
4253
target_compile_definitions(sdl_sample PRIVATE CLI11_HAS_FILESYSTEM=0)

0 commit comments

Comments
 (0)