Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dartflo
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository 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
Aerospace and Mechanical Engineering
dartflo
Commits
d8ebe4b3
Commit
d8ebe4b3
authored
3 years ago
by
Adrien Crovato
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/feat_install_perf' into adri
parents
6d06fa37
8d60acd5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#5761
passed
3 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
dart/_src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
dart/_src/CMakeLists.txt
with
3 additions
and
2 deletions
CMakeLists.txt
+
2
−
1
View file @
d8ebe4b3
...
...
@@ -75,7 +75,7 @@ ENDIF()
# SWIG
FIND_PACKAGE
(
SWIG REQUIRED
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio"
)
# not MSVC because of nmake & jom
SET
(
CMAKE_SWIG_OUTDIR
"
${
EXECUTABLE_OUTPUT_PATH
}
/
$
{
CMAKE_BUILD_TYPE
}
/"
)
SET
(
CMAKE_SWIG_OUTDIR
"
${
EXECUTABLE_OUTPUT_PATH
}
/$
(Configuration)
/"
)
ELSE
()
SET
(
CMAKE_SWIG_OUTDIR
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
ENDIF
()
...
...
@@ -108,6 +108,7 @@ ENABLE_TESTING()
# -- INSTALL
IF
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
EXECUTE_PROCESS
(
COMMAND
${
PYTHON_EXECUTABLE
}
-m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE
)
STRING
(
REGEX REPLACE
"
\\\\
"
"/"
PY_SITE
${
PY_SITE
}
)
SET
(
CMAKE_INSTALL_PREFIX
"
${
PY_SITE
}
/dartflo"
CACHE STRING
"Install location"
FORCE
)
SET
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE
)
ELSE
()
...
...
This diff is collapsed.
Click to expand it.
dart/_src/CMakeLists.txt
+
1
−
1
View file @
d8ebe4b3
...
...
@@ -48,5 +48,5 @@ SWIG_LINK_LIBRARIES(dartw
dart tbox fwk
${
PYTHON_LIBRARIES
}
)
INSTALL
(
FILES
${
CMAKE_SWIG_OUTDIR
}
/dartw.py DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
INSTALL
(
FILES
${
EXECUTABLE_OUTPUT_PATH
}
/\
${
BUILD_TYPE
}
/dartw.py DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
INSTALL
(
TARGETS _dartw DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
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