Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
bctoolbox
Commits
f93ebb95
Commit
f93ebb95
authored
Feb 16, 2016
by
jehan
Browse files
better rpm integration using CMAKE_INSTALL_DIR
parent
1a0e98f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
CMakeLists.txt
CMakeLists.txt
+3
-2
src/CMakeLists.txt
src/CMakeLists.txt
+3
-3
No files found.
CMakeLists.txt
View file @
f93ebb95
...
...
@@ -43,6 +43,7 @@ include(CheckLibraryExists)
include
(
CheckSymbolExists
)
include
(
CheckCSourceCompiles
)
include
(
CMakePushCheckState
)
include
(
GNUInstallDirs
)
list
(
APPEND CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
...
...
@@ -81,7 +82,7 @@ if(POLARSSL_FOUND)
endif
()
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/bctoolbox.pc.in
${
CMAKE_CURRENT_BINARY_DIR
}
/bctoolbox.pc
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/bctoolbox.pc DESTINATION
lib
/pkgconfig
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/bctoolbox.pc DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig
)
include_directories
(
...
...
@@ -172,7 +173,7 @@ configure_file(cmake/BcToolboxConfig.cmake.in
@ONLY
)
set
(
ConfigPackageLocation
lib
/cmake/BcToolbox
)
set
(
ConfigPackageLocation
${
CMAKE_INSTALL_LIBDIR
}
/cmake/BcToolbox
)
install
(
EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
FILE BcToolboxTargets.cmake
DESTINATION
${
ConfigPackageLocation
}
...
...
src/CMakeLists.txt
View file @
f93ebb95
...
...
@@ -59,9 +59,9 @@ endif()
install
(
TARGETS bctoolbox EXPORT
${
EXPORT_TARGETS_NAME
}
Targets
RUNTIME DESTINATION
bin
LIBRARY DESTINATION
lib
ARCHIVE DESTINATION
lib
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
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