Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-xt
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
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ag-ohlberger
dune-community
dune-xt
Commits
1c43ee1e
Verified
Commit
1c43ee1e
authored
6 years ago
by
René Fritze
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] never strip objects and restrict dep make to -j1
parent
67288746
No related branches found
No related tags found
2 merge requests
!10
Fix compilation with new clang
,
!6
Merge pybind
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/modules/DunePybindxiUtils.cmake
+2
-15
2 additions, 15 deletions
cmake/modules/DunePybindxiUtils.cmake
with
2 additions
and
15 deletions
cmake/modules/DunePybindxiUtils.cmake
+
2
−
15
View file @
1c43ee1e
...
@@ -143,7 +143,7 @@ function(dune_pybindxi_add_module target_name)
...
@@ -143,7 +143,7 @@ function(dune_pybindxi_add_module target_name)
endif
()
endif
()
# Make sure C++11/14 are enabled
# Make sure C++11/14 are enabled
target_compile_options
(
${
target_name
}
PUBLIC
${
PYBIND11_CPP_STANDARD
}
)
target_compile_options
(
${
target_name
}
PUBLIC
${
PYBIND11_CPP_STANDARD
}
-g
)
if
(
ARG_NO_EXTRAS
)
if
(
ARG_NO_EXTRAS
)
return
()
return
()
...
@@ -151,19 +151,6 @@ function(dune_pybindxi_add_module target_name)
...
@@ -151,19 +151,6 @@ function(dune_pybindxi_add_module target_name)
_dune_pybind11_add_lto_flags
(
${
target_name
}
${
ARG_THIN_LTO
}
)
_dune_pybind11_add_lto_flags
(
${
target_name
}
${
ARG_THIN_LTO
}
)
if
(
NOT MSVC AND NOT
${
CMAKE_BUILD_TYPE
}
MATCHES Debug
)
# Strip unnecessary sections of the binary on Linux/Mac OS
if
(
CMAKE_STRIP
)
if
(
APPLE
)
add_custom_command
(
TARGET
${
target_name
}
POST_BUILD
COMMAND
${
CMAKE_STRIP
}
-x $<TARGET_FILE:
${
target_name
}
>
)
else
()
add_custom_command
(
TARGET
${
target_name
}
POST_BUILD
COMMAND
${
CMAKE_STRIP
}
$<TARGET_FILE:
${
target_name
}
>
)
endif
()
endif
()
endif
()
if
(
MSVC
)
if
(
MSVC
)
# /MP enables multithreaded builds (relevant when there are many files), /bigobj is
# /MP enables multithreaded builds (relevant when there are many files), /bigobj is
# needed for bigger binding projects due to the limit to 64k addressable sections
# needed for bigger binding projects due to the limit to 64k addressable sections
...
@@ -194,7 +181,7 @@ macro(dxt_add_make_dependent_bindings)
...
@@ -194,7 +181,7 @@ macro(dxt_add_make_dependent_bindings)
set
(
tdir
${${
_mod
}
_binary_dir
}
)
set
(
tdir
${${
_mod
}
_binary_dir
}
)
if
(
IS_DIRECTORY
${
tdir
}
)
if
(
IS_DIRECTORY
${
tdir
}
)
add_custom_target
(
${
_mod
}
_bindings
add_custom_target
(
${
_mod
}
_bindings
COMMAND
${
CMAKE_COMMAND
}
--build
${
tdir
}
--target bindings
)
COMMAND
${
CMAKE_COMMAND
}
--build
${
tdir
}
--target bindings
-- -j1
)
add_dependencies
(
dependent_bindings
${
_mod
}
_bindings
)
add_dependencies
(
dependent_bindings
${
_mod
}
_bindings
)
endif
()
endif
()
endforeach
()
endforeach
()
...
...
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