Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
aeed774f
Commit
aeed774f
authored
4 years ago
by
Dave Houlton
Browse files
Options
Downloads
Patches
Plain Diff
(Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition (/Zo)
parent
2e2d9b61
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!83
Merge Linden 6.6.7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/cmake/00-Common.cmake
+9
-4
9 additions, 4 deletions
indra/cmake/00-Common.cmake
with
9 additions
and
4 deletions
indra/cmake/00-Common.cmake
+
9
−
4
View file @
aeed774f
...
@@ -42,8 +42,8 @@ if(NON_RELEASE_CRASH_REPORTING)
...
@@ -42,8 +42,8 @@ if(NON_RELEASE_CRASH_REPORTING)
set
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DLL_SEND_CRASH_REPORTS=1"
)
set
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DLL_SEND_CRASH_REPORTS=1"
)
endif
()
endif
()
# Don't bother with
a
MinSizeRel build.
# Don't bother with MinSizeRel
or Debug
build
s
.
set
(
CMAKE_CONFIGURATION_TYPES
"RelWithDebInfo;Release
;Debug
"
CACHE STRING
set
(
CMAKE_CONFIGURATION_TYPES
"RelWithDebInfo;Release"
CACHE STRING
"Supported build types."
FORCE
)
"Supported build types."
FORCE
)
...
@@ -70,13 +70,18 @@ if (WINDOWS)
...
@@ -70,13 +70,18 @@ if (WINDOWS)
if
(
ADDRESS_SIZE EQUAL 32
)
if
(
ADDRESS_SIZE EQUAL 32
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/p:PreferredToolArchitecture=x64"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/p:PreferredToolArchitecture=x64"
)
endif
()
endif
()
# Preserve first-pass-through versions (ie no FORCE overwrite). Prevents recursive addition of /Zo (04/2021)
set
(
OG_CMAKE_CXX_FLAGS_RELEASE
${
CMAKE_CXX_FLAGS_RELEASE
}
CACHE STRING
"OG_CXX_FLAGS_RELEASE"
)
set
(
OG_CMAKE_CXX_FLAGS_RELWITHDEBINFO
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
CACHE STRING
"OG_CXX_FLAGS_RELWITHDEBINFO"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
/Zo"
"
${
OG_
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
/Zo"
CACHE STRING
"C++ compiler release-with-debug options"
FORCE
)
CACHE STRING
"C++ compiler release-with-debug options"
FORCE
)
set
(
CMAKE_CXX_FLAGS_RELEASE
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
${
LL_CXX_FLAGS
}
/Zo"
"
${
OG_
CMAKE_CXX_FLAGS_RELEASE
}
${
LL_CXX_FLAGS
}
/Zo"
CACHE STRING
"C++ compiler release options"
FORCE
)
CACHE STRING
"C++ compiler release options"
FORCE
)
# zlib has assembly-language object files incompatible with SAFESEH
# zlib has assembly-language object files incompatible with SAFESEH
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment