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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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 Archive
Alchemy Viewer
Commits
4febb6bc
Commit
4febb6bc
authored
5 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Target 10.13 deployment on osx
parent
e5b93408
No related branches found
No related tags found
1 merge request
!12
Master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/cmake/00-Common.cmake
+1
-5
1 addition, 5 deletions
indra/cmake/00-Common.cmake
indra/cmake/Variables.cmake
+2
-2
2 additions, 2 deletions
indra/cmake/Variables.cmake
with
3 additions
and
7 deletions
indra/cmake/00-Common.cmake
+
1
−
5
View file @
4febb6bc
...
@@ -287,7 +287,7 @@ if (DARWIN)
...
@@ -287,7 +287,7 @@ if (DARWIN)
add_definitions
(
-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION
)
add_definitions
(
-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION
)
set
(
CMAKE_CXX_LINK_FLAGS
"-Wl,-headerpad_max_install_names,-search_paths_first"
)
set
(
CMAKE_CXX_LINK_FLAGS
"-Wl,-headerpad_max_install_names,-search_paths_first"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
CMAKE_CXX_LINK_FLAGS
}
"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
CMAKE_CXX_LINK_FLAGS
}
"
)
set
(
DARWIN_extra_cstar_flags
"-gdwarf-2 -fobjc-arc -fno-strict-aliasing"
)
set
(
DARWIN_extra_cstar_flags
"-gdwarf-2 -fobjc-arc -fno-strict-aliasing
-faligned-allocation
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
DARWIN_extra_cstar_flags
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
DARWIN_extra_cstar_flags
}
"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
DARWIN_extra_cstar_flags
}
"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
DARWIN_extra_cstar_flags
}
"
)
# NOTE: it's critical that the optimization flag is put in front.
# NOTE: it's critical that the optimization flag is put in front.
...
@@ -302,10 +302,6 @@ if (DARWIN)
...
@@ -302,10 +302,6 @@ if (DARWIN)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-O3
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"-O3
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-Ofast -ffast-math -mavx -mprefer-vector-width=128
${
CMAKE_CXX_FLAGS_RELEASE
}
"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-Ofast -ffast-math -mavx -mprefer-vector-width=128
${
CMAKE_CXX_FLAGS_RELEASE
}
"
)
set
(
CMAKE_C_FLAGS_RELEASE
"-Ofast -ffast-math -mavx -mprefer-vector-width=128
${
CMAKE_C_FLAGS_RELEASE
}
"
)
set
(
CMAKE_C_FLAGS_RELEASE
"-Ofast -ffast-math -mavx -mprefer-vector-width=128
${
CMAKE_C_FLAGS_RELEASE
}
"
)
if
(
USE_LTO
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-fforce-emit-vtables -fwhole-program-vtables"
)
set
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS_RELEASE
}
-fforce-emit-vtables -fwhole-program-vtables"
)
endif
()
endif
()
endif
()
endif
(
DARWIN
)
endif
(
DARWIN
)
...
...
This diff is collapsed.
Click to expand it.
indra/cmake/Variables.cmake
+
2
−
2
View file @
4febb6bc
...
@@ -206,8 +206,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
...
@@ -206,8 +206,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if
(
XCODE_VERSION LESS 10.2.0
)
if
(
XCODE_VERSION LESS 10.2.0
)
message
(
FATAL_ERROR
"Xcode 10.2.0 or greater is required."
)
message
(
FATAL_ERROR
"Xcode 10.2.0 or greater is required."
)
endif
(
XCODE_VERSION LESS 10.2.0
)
endif
(
XCODE_VERSION LESS 10.2.0
)
message
(
"Building with "
${
CMAKE_OSX_SYSROOT
}
)
message
(
"Building with "
${
CMAKE_OSX_SYSROOT
}
)
set
(
CMAKE_OSX_DEPLOYMENT_TARGET 10.1
4
)
set
(
CMAKE_OSX_DEPLOYMENT_TARGET 10.1
3
)
set
(
CMAKE_XCODE_GENERATE_SCHEME ON
)
set
(
CMAKE_XCODE_GENERATE_SCHEME ON
)
if
(
USE_ASAN
)
if
(
USE_ASAN
)
...
...
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