Skip to content

cmake: reword DaemonFlags a bit #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −6
Open

cmake: reword DaemonFlags a bit #2021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions cmake/DaemonFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,14 @@ if (USE_FLOAT_EXCEPTIONS)
add_definitions(-DDAEMON_USE_FLOAT_EXCEPTIONS)
endif()

if (NOT NACL AND BUILD_CLIENT)
if (NOT YOKAI_TARGET_SYSTEM_NACL AND BUILD_CLIENT)
option(USE_OPENMP "Use OpenMP to parallelize some tasks" OFF)
endif()

if (NOT YOKAI_TARGET_SYSTEM_NACL AND BUILD_CLIENT AND USE_OPENMP)
set(ENABLE_OPENMP ON)
endif()

if (YOKAI_CXX_COMPILER_MSVC_COMPATIBILITY)
if (YOKAI_CXX_COMPILER_MSVC)
# /MP doesn't do anything and prints a warning in the Clang clone.
Expand All @@ -275,7 +279,7 @@ if (YOKAI_CXX_COMPILER_MSVC_COMPATIBILITY)
set_cxx_flag("/std:c++23preview")
endif()

if (NOT NACL AND BUILD_CLIENT AND USE_OPENMP)
if (ENABLE_OPENMP)
# Flag checks doen't work with MSVC so we assume it's there.
set(OPENMP_COMPILE_FLAG "/openmp")
endif()
Expand Down Expand Up @@ -385,7 +389,7 @@ else()
endif()
endif()

if (NOT NACL AND BUILD_CLIENT AND USE_OPENMP)
if (ENABLE_OPENMP)
check_CXX_compiler_flag("-fopenmp" FLAG_FOPENMP)

if (FLAG_FOPENMP)
Expand All @@ -396,7 +400,7 @@ else()
endif()
endif()

if (YOKAI_TARGET_SYSTEM_NACL AND USE_NACL_SAIGO AND DAEMON_NACL_ARCH_ARMHF)
if (YOKAI_TARGET_SYSTEM_NACL AND YOKAI_CXX_COMPILER_SAIGO AND YOKAI_TARGET_ARCH_ARMHF)
# Saigo produces broken arm builds when optimizing them.
# See: https://github.com/Unvanquished/Unvanquished/issues/3297
# When setting this clang-specific option, we don't have to care
Expand Down Expand Up @@ -445,7 +449,7 @@ else()
try_flag(WARNINGS "-Werror")
endif()

if (YOKAI_TARGET_SYSTEM_NACL AND NOT USE_NACL_SAIGO)
if (YOKAI_TARGET_SYSTEM_NACL AND YOKAI_CXX_COMPILER_PNACL)
# PNaCl only supports libc++ as standard library.
set_c_cxx_flag("-stdlib=libc++")
set_c_cxx_flag("--pnacl-allow-exceptions")
Expand Down Expand Up @@ -508,7 +512,7 @@ else()
# Don't set _FORTIFY_SOURCE in debug builds.
endif()

if (NOT NACL)
if (NOT YOKAI_TARGET_SYSTEM_NACL)
# Saigo reports weird errors when building some cgame and sgame arm nexe with PIC:
# > error: Cannot represent a difference across sections
# > error: expected relocatable expression
Expand Down
Loading