Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dartflo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
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
Dechamps Paul
dartflo
Commits
8d60acd5
Commit
8d60acd5
authored
3 years ago
by
Adrien Crovato
Browse files
Options
Downloads
Patches
Plain Diff
Update install procedure and amfe
parent
448eee18
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 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
ext/amfe
+1
-1
1 addition, 1 deletion
ext/amfe
with
4 additions
and
3 deletions
CMakeLists.txt
+
2
−
1
View file @
8d60acd5
...
@@ -75,7 +75,7 @@ ENDIF()
...
@@ -75,7 +75,7 @@ ENDIF()
# SWIG
# SWIG
FIND_PACKAGE
(
SWIG REQUIRED
)
FIND_PACKAGE
(
SWIG REQUIRED
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio"
)
# not MSVC because of nmake & jom
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
()
ELSE
()
SET
(
CMAKE_SWIG_OUTDIR
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
SET
(
CMAKE_SWIG_OUTDIR
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
ENDIF
()
ENDIF
()
...
@@ -108,6 +108,7 @@ ENABLE_TESTING()
...
@@ -108,6 +108,7 @@ ENABLE_TESTING()
# -- INSTALL
# -- INSTALL
IF
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
IF
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
EXECUTE_PROCESS
(
COMMAND
${
PYTHON_EXECUTABLE
}
-m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE
)
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
"
${
PY_SITE
}
/dartflo"
CACHE STRING
"Install location"
FORCE
)
SET
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE
)
SET
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE
)
ELSE
()
ELSE
()
...
...
This diff is collapsed.
Click to expand it.
dart/_src/CMakeLists.txt
+
1
−
1
View file @
8d60acd5
...
@@ -48,5 +48,5 @@ SWIG_LINK_LIBRARIES(dartw
...
@@ -48,5 +48,5 @@ SWIG_LINK_LIBRARIES(dartw
dart tbox fwk
${
PYTHON_LIBRARIES
}
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
}
)
INSTALL
(
TARGETS _dartw DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
This diff is collapsed.
Click to expand it.
amfe
@
e4ae8749
Compare
87212cfb
...
e4ae8749
Subproject commit
87212cfb034a92cc83acfeea751f076a84c12779
Subproject commit
e4ae874992b92b2fb683d96833b714ddebff149b
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