drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox] Fix MSVC build

Browse Source
This commit is contained in:
Gary Talent 2020-11-07 17:59:17 -06:00
parent ef85eea691
commit 40f3c4ecb5
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/ox/src/CMakeLists.txt vendored
View File

@ -1,3 +1 @@
cmake_minimum_required(VERSION 2.8)
add_subdirectory(ox) add_subdirectory(ox)

2
deps/ox/src/ox/clargs/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.10)
add_library( add_library(
OxClArgs OxClArgs

2
deps/ox/src/ox/fs/CMakeLists.txt vendored
View File

@ -10,7 +10,7 @@ add_library(
) )
if(NOT OX_BARE_METAL) if(NOT OX_BARE_METAL)
if(NOT APPLE) if(NOT APPLE AND NOT MSVC)
target_link_libraries( target_link_libraries(
OxFS PUBLIC OxFS PUBLIC
stdc++fs stdc++fs

4
deps/ox/src/ox/oc/CMakeLists.txt vendored
View File

@ -6,7 +6,9 @@ add_library(
find_package(jsoncpp REQUIRED) find_package(jsoncpp REQUIRED)
target_compile_options(OxOrganicClaw PRIVATE -Wsign-conversion) if(NOT MSVC)
target_compile_options(OxOrganicClaw PRIVATE -Wsign-conversion)
endif()
target_link_libraries( target_link_libraries(
OxOrganicClaw PUBLIC OxOrganicClaw PUBLIC

4
deps/ox/src/ox/std/CMakeLists.txt vendored
View File

@ -14,7 +14,9 @@ add_library(
trace.cpp trace.cpp
) )
target_compile_options(OxStd PRIVATE -Wsign-conversion) if(NOT MSVC)
target_compile_options(OxStd PRIVATE -Wsign-conversion)
endif()
if(NOT OX_BARE_METAL) if(NOT OX_BARE_METAL)
set_property( set_property(

2
deps/ox/src/ox/std/test/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.10)
add_executable( add_executable(
StdTest StdTest