Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
belr
Commits
8ac0364a
Commit
8ac0364a
authored
Oct 08, 2019
by
Simon Morlat
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/rpm' into 'master'
Fix rpm. See merge request
!12
parents
374041a9
fc884829
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
CMakeLists.txt
CMakeLists.txt
+3
-1
build/rpm/belr.spec.cmake
build/rpm/belr.spec.cmake
+2
-2
No files found.
CMakeLists.txt
View file @
8ac0364a
...
...
@@ -128,7 +128,7 @@ endif()
include
(
CMakePackageConfigHelpers
)
set
(
EXPORT_TARGET_NAME belr
)
set
(
ConfigPackageLocation
shar
e/
${
EXPORT_TARGET_NAME
}
/cmake
)
set
(
ConfigPackageLocation
"
${
CMAKE_INSTALL_LIBDIR
}
/cmak
e/
${
EXPORT_TARGET_NAME
}
"
)
export
(
EXPORT
${
EXPORT_TARGET_NAME
}
Targets
FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXPORT_TARGET_NAME
}
Targets.cmake"
...
...
@@ -144,6 +144,8 @@ install(EXPORT ${EXPORT_TARGET_NAME}Targets
FILE
${
EXPORT_TARGET_NAME
}
Targets.cmake
DESTINATION
${
ConfigPackageLocation
}
)
#Yes, an install directive is necessary. The INSTALL_DESTINATION parameter of configure_package_config_file() above does NOTHING.
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXPORT_TARGET_NAME
}
Config.cmake"
DESTINATION
${
ConfigPackageLocation
}
...
...
build/rpm/belr.spec.cmake
View file @
8ac0364a
...
...
@@ -98,8 +98,8 @@ rm -rf $RPM_BUILD_ROOT
%if @ENABLE_SHARED@
%{_libdir}/libbelr.so
%endif
%{_
data
dir}/
Belr/
cmake/
B
elrConfig*.cmake
%{_
data
dir}/
Belr/
cmake/
B
elrTargets*.cmake
%{_
lib
dir}/cmake/
belr/b
elrConfig*.cmake
%{_
lib
dir}/cmake/
belr/b
elrTargets*.cmake
%if @ENABLE_TESTS@ || @ENABLE_TOOLS@
%{_bindir}/*
%endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment