Skip to content

Commit

Permalink
WIN32 no longer automatically defined?
Browse files Browse the repository at this point in the history
  • Loading branch information
JDanielSmith committed Dec 22, 2022
1 parent 5a42864 commit 52358ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
# set warning level to /W3
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
add_compile_options(/std:c++14)
add_compile_options(/std:c++14)
elseif (UNIX)
add_compile_options(
-Wno-deprecated
-Wno-unused-value
-Wno-unused-but-set-variable
)
add_compile_options(-std=c++14)
add_compile_options(-std=c++14)
endif()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
Expand Down
3 changes: 3 additions & 0 deletions modules/drivers/xml/xerces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,9 @@ else()
# MacOS could be supported here as well
if (WIN32)
list(APPEND EXCLUDES ${UNIX_SPECIFIC})
add_definitions(
-DWIN32
)
else()
list(APPEND EXCLUDES ${WIN_SPECIFIC})
endif()
Expand Down

0 comments on commit 52358ea

Please sign in to comment.