mirror of
https://github.com/Z3Prover/z3
synced 2025-07-18 02:16:40 +00:00
Merge branch 'master' into polysat
This commit is contained in:
commit
e105a91d4a
18 changed files with 41 additions and 80 deletions
|
@ -188,9 +188,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|||
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
message(STATUS "Platform: Linux")
|
||||
list(APPEND Z3_COMPONENT_CXX_DEFINES "-D_LINUX_")
|
||||
if (TARGET_ARCHITECTURE STREQUAL "x86_64")
|
||||
list(APPEND Z3_COMPONENT_CXX_DEFINES "-D_USE_THREAD_LOCAL")
|
||||
endif()
|
||||
elseif (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||
message(STATUS "Platform: Android")
|
||||
list(APPEND Z3_COMPONENT_CXX_DEFINES "-D_ANDROID_")
|
||||
|
@ -348,14 +345,6 @@ endif()
|
|||
option(Z3_BUILD_LIBZ3_SHARED "Build libz3 as a shared library if true, otherwise build a static library" ON)
|
||||
|
||||
|
||||
################################################################################
|
||||
# Symbol visibility
|
||||
################################################################################
|
||||
if (NOT MSVC)
|
||||
z3_add_cxx_flag("-fvisibility=hidden" REQUIRED)
|
||||
z3_add_cxx_flag("-fvisibility-inlines-hidden" REQUIRED)
|
||||
endif()
|
||||
|
||||
################################################################################
|
||||
# Tracing
|
||||
################################################################################
|
||||
|
@ -367,20 +356,6 @@ else()
|
|||
list(APPEND Z3_COMPONENT_CXX_DEFINES $<$<CONFIG:Debug>:_TRACE>)
|
||||
endif()
|
||||
|
||||
################################################################################
|
||||
# Position independent code
|
||||
################################################################################
|
||||
# This is required because code built in the components will end up in a shared
|
||||
# library.
|
||||
|
||||
# Avoid adding -fPIC compiler switch if we compile with MSVC (which does not
|
||||
# support the flag) or if we target Windows, which generally does not use
|
||||
# position independent code for native code shared libraries (DLLs).
|
||||
if (NOT (MSVC OR MINGW OR WIN32))
|
||||
z3_add_cxx_flag("-fPIC" REQUIRED)
|
||||
endif()
|
||||
|
||||
|
||||
################################################################################
|
||||
# Link time optimization
|
||||
################################################################################
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue