mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 14:19:07 +08:00
ac541816b1
* [openscap] update to 1.3.6 * update version * update evrsion * Fix conflict * update evrsion * CI [skip actions] * fix xmlsec dependency * fix deps * fix deps * fix deps * fix deps * fix deps * CI * version 1.3.7 * update to 1.3.7 * world * CI * fix deps * fix deps * CI * fix deps * CI * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util --------- Co-authored-by: Jonliu1993 <13720414433@163.com>
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
|
|
index f500e1d..ebddcbf 100644
|
|
--- a/utils/CMakeLists.txt
|
|
+++ b/utils/CMakeLists.txt
|
|
@@ -1,5 +1,5 @@
|
|
install(PROGRAMS "oscap-run-sce-script"
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ DESTINATION tools/openscap
|
|
)
|
|
|
|
if(ENABLE_OSCAP_UTIL)
|
|
@@ -24,13 +24,13 @@ if(ENABLE_OSCAP_UTIL)
|
|
target_link_libraries(oscap ${GETOPT_LIBRARY})
|
|
endif()
|
|
|
|
- set(OSCAP_UTIL_DESTINATION ".")
|
|
+ set(OSCAP_UTIL_DESTINATION bin)
|
|
# Install the 'oscap' utility
|
|
install(TARGETS "oscap"
|
|
DESTINATION ${OSCAP_UTIL_DESTINATION}
|
|
)
|
|
else()
|
|
- set(OSCAP_UTIL_DESTINATION tools)
|
|
+ set(OSCAP_UTIL_DESTINATION bin)
|
|
# Install the 'oscap' utility
|
|
install(TARGETS "oscap"
|
|
DESTINATION ${OSCAP_UTIL_DESTINATION}
|
|
@@ -110,7 +110,7 @@ if(ENABLE_OSCAP_UTIL_SSH)
|
|
endif()
|
|
if(ENABLE_OSCAP_UTIL_AUTOTAILOR)
|
|
install(PROGRAMS "autotailor"
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ DESTINATION tools/openscap
|
|
)
|
|
install(FILES "autotailor.8"
|
|
DESTINATION "${CMAKE_INSTALL_MANDIR}/man8"
|