Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gaudi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Gaudi
Gaudi
Commits
fd69f284
Commit
fd69f284
authored
3 weeks ago
by
Marco Clemencic
Browse files
Options
Downloads
Plain Diff
Correctly set Gaudi_VERSION when building as a subproject
See merge request
!1718
parents
89f38fab
62930bd1
No related branches found
No related tags found
1 merge request
!1718
Correctly set Gaudi_VERSION when building as a subproject
Pipeline
#11674020
passed
3 weeks ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+5
-4
5 additions, 4 deletions
CMakeLists.txt
with
5 additions
and
4 deletions
CMakeLists.txt
+
5
−
4
View file @
fd69f284
...
@@ -206,6 +206,11 @@ if(NOT PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME) # If we are building the full s
...
@@ -206,6 +206,11 @@ if(NOT PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME) # If we are building the full s
# but we add Gaudi's CMake modules to the CMAKE_MODULE_PATH for downstream projects
# but we add Gaudi's CMake modules to the CMAKE_MODULE_PATH for downstream projects
list
(
PREPEND CMAKE_MODULE_PATH
${
PROJECT_SOURCE_DIR
}
/cmake
)
list
(
PREPEND CMAKE_MODULE_PATH
${
PROJECT_SOURCE_DIR
}
/cmake
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
PARENT_SCOPE
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
PARENT_SCOPE
)
# Set the version of the project as a cache variable to be seen by other
# projects in the same super-project.
set
(
${
PROJECT_NAME
}
_VERSION
"
${
PROJECT_VERSION
}
"
CACHE STRING
"Version of
${
PROJECT_NAME
}
"
FORCE
)
return
()
return
()
endif
()
endif
()
...
@@ -277,10 +282,6 @@ set(CPACK_SOURCE_IGNORE_FILES "/InstallArea/;/build\\\\..*/;/\\\\.git/;/\\\\.git
...
@@ -277,10 +282,6 @@ set(CPACK_SOURCE_IGNORE_FILES "/InstallArea/;/build\\\\..*/;/\\\\.git/;/\\\\.git
set
(
CPACK_SOURCE_GENERATOR
"ZIP;RPM"
)
set
(
CPACK_SOURCE_GENERATOR
"ZIP;RPM"
)
include
(
CPack
)
include
(
CPack
)
# Set the version of the project as a cache variable to be seen by other
# projects in the same super-project.
set
(
${
PROJECT_NAME
}
_VERSION
"
${
PROJECT_VERSION
}
"
CACHE STRING
"Version of
${
PROJECT_NAME
}
"
FORCE
)
# Optionally enable compatibility with old-style CMake configurations, via helper module
# Optionally enable compatibility with old-style CMake configurations, via helper module
option
(
GAUDI_LEGACY_CMAKE_SUPPORT
"Enable compatibility with old-style CMake builds"
"$ENV{GAUDI_LEGACY_CMAKE_SUPPORT}"
)
option
(
GAUDI_LEGACY_CMAKE_SUPPORT
"Enable compatibility with old-style CMake builds"
"$ENV{GAUDI_LEGACY_CMAKE_SUPPORT}"
)
if
(
GAUDI_LEGACY_CMAKE_SUPPORT
)
if
(
GAUDI_LEGACY_CMAKE_SUPPORT
)
...
...
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