Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
blaster
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
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
Aerospace and Mechanical Engineering
blaster
Commits
b3942db5
Verified
Commit
b3942db5
authored
2 months ago
by
Paul Dechamps
Browse files
Options
Downloads
Patches
Plain Diff
(ci) Follow dart commit and updated install rules
Avoid forcing installation location
parent
f9cd6574
No related branches found
Branches containing commit
No related tags found
1 merge request
!1
BLASTER v1.0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+5
-5
5 additions, 5 deletions
CMakeLists.txt
blast/CMakeLists.txt
+2
-2
2 additions, 2 deletions
blast/CMakeLists.txt
modules/dartflo
+1
-1
1 addition, 1 deletion
modules/dartflo
with
8 additions
and
8 deletions
CMakeLists.txt
+
5
−
5
View file @
b3942db5
...
...
@@ -78,15 +78,15 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) # to find "amfe_def.h"
ENABLE_TESTING
()
# -- INSTALL
# Check if the project is the main project and the installation path is not specified
IF
(
CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND
NOT
(
CMAKE_INSTALL_PREFIX MATCHES
"blaster$"
))
SET
(
CMAKE_INSTALL_PREFIX
"
${
CMAKE_INSTALL_PREFIX
}
/blaster"
CACHE STRING
"Install location"
FORCE
)
ENDIF
()
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
}
/blaster"
CACHE STRING
"Install location"
FORCE
)
SET
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE
)
ELSE
()
IF
(
NOT
(
CMAKE_INSTALL_PREFIX MATCHES
"blaster$"
))
SET
(
CMAKE_INSTALL_PREFIX
"
${
CMAKE_INSTALL_PREFIX
}
/blaster"
CACHE STRING
"Install location"
FORCE
)
ENDIF
()
ENDIF
()
IF
(
UNIX
)
...
...
@@ -102,7 +102,7 @@ ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY
(
blast
)
# -- FINAL
MESSAGE
(
STATUS
"PROJECT:
${
CMAKE_
PROJECT_NAME
}
"
)
MESSAGE
(
STATUS
"PROJECT:
${
PROJECT_NAME
}
"
)
MESSAGE
(
STATUS
"* SYSTEM NAME=
\"
${
CMAKE_SYSTEM_NAME
}
\"
"
)
MESSAGE
(
STATUS
"* CXX COMPILER:
${
CMAKE_CXX_COMPILER_ID
}
"
)
MESSAGE
(
STATUS
"* CXX STANDARD:
${
CMAKE_CXX_STANDARD
}
"
)
...
...
This diff is collapsed.
Click to expand it.
blast/CMakeLists.txt
+
2
−
2
View file @
b3942db5
...
...
@@ -21,8 +21,8 @@ MACRO_AddTest(${CMAKE_CURRENT_SOURCE_DIR}/tests)
# Add to install
INSTALL
(
FILES
${
CMAKE_CURRENT_LIST_DIR
}
/__init__.py
${
CMAKE_CURRENT_LIST_DIR
}
/
c
oupler.py
${
CMAKE_CURRENT_LIST_DIR
}
/
u
tils.py
${
CMAKE_CURRENT_LIST_DIR
}
/
blC
oupler.py
${
CMAKE_CURRENT_LIST_DIR
}
/
blU
tils.py
DESTINATION blast
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_LIST_DIR
}
/api
${
CMAKE_CURRENT_LIST_DIR
}
/interfaces
...
...
This diff is collapsed.
Click to expand it.
dartflo
@
4d01a1de
Compare
becec3eb
...
4d01a1de
Subproject commit
becec3ebf3e3eafcc2a454215a5fb6688a1d0f67
Subproject commit
4d01a1dee135a7489b51093546ea41aa64f15352
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