Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
amfe
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
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
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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
amfe
Commits
0ec92c71
Commit
0ec92c71
authored
2 years ago
by
Adrien Crovato
Browse files
Options
Downloads
Patches
Plain Diff
Consistent names for TBB_INTERFACE_VERSION
parent
18080994
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!6
amfe v1.0.5
Pipeline
#6198
passed
2 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMake/FindTBB.cmake
+2
-2
2 additions, 2 deletions
CMake/FindTBB.cmake
tbox/src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
tbox/src/CMakeLists.txt
with
3 additions
and
3 deletions
CMake/FindTBB.cmake
+
2
−
2
View file @
0ec92c71
...
...
@@ -263,8 +263,8 @@ ELSE()
MESSAGE
(
FATAL_ERROR
"Cannot find version file in
${
TBB_INCLUDE_DIRS
}
/tbb."
)
ENDIF
()
# If file has been found, also read the interface version
STRING
(
REGEX REPLACE
".*#define TBB_INTERFACE_VERSION ([0-9]+).*"
"
\\
1"
_TBB_
VERSION_
INTERFACE
"
${
_FILE
}
"
)
SET
(
TBB_INTERFACE_VERSION
${
_TBB_
VERSION_INTERFA
CE
}
)
STRING
(
REGEX REPLACE
".*#define TBB_INTERFACE_VERSION ([0-9]+).*"
"
\\
1"
_TBB_INTERFACE
_VERSION
"
${
_FILE
}
"
)
SET
(
TBB_INTERFACE_VERSION
${
_TBB_
INTERFACE_VERSION
}
CACHE STRING
""
FOR
CE
)
IF
(
_VERB
)
MESSAGE
(
STATUS
"TBB version:
${
TBB_VERSION
}
(
${
TBB_INTERFACE_VERSION
}
)"
)
ENDIF
()
...
...
This diff is collapsed.
Click to expand it.
tbox/src/CMakeLists.txt
+
1
−
1
View file @
0ec92c71
...
...
@@ -25,7 +25,7 @@ TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${PROJECT_SOURCE_DIR}/tbox/src)
FIND_PACKAGE
(
TBB REQUIRED
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
${
TBB_CXX_FLAGS_DEBUG
}
"
)
TARGET_INCLUDE_DIRECTORIES
(
tbox PUBLIC
${
TBB_INCLUDE_DIRS
}
)
IF
(
TBB_
VERSION_
INTERFACE LESS 11004
)
IF
(
TBB_INTERFACE
_VERSION
LESS 11004
)
TARGET_COMPILE_DEFINITIONS
(
tbox PUBLIC TBB_PREVIEW_GLOBAL_CONTROL
)
ENDIF
()
TARGET_LINK_LIBRARIES
(
tbox
${
TBB_LIBRARIES
}
)
...
...
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