diff options
Diffstat (limited to 'vcpkg/ports/openscap/install-dirs.diff')
| -rw-r--r-- | vcpkg/ports/openscap/install-dirs.diff | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/vcpkg/ports/openscap/install-dirs.diff b/vcpkg/ports/openscap/install-dirs.diff new file mode 100644 index 0000000..9ca3efb --- /dev/null +++ b/vcpkg/ports/openscap/install-dirs.diff @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f01a91..4c0b074 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -503,6 +503,9 @@ else() + set(OSCAP_DEFAULT_XSLT_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/xsl") + set(OSCAP_DEFAULT_CPE_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/cpe") + endif() ++set(OSCAP_DEFAULT_SCHEMA_PATH share/openscap/schemas) ++set(OSCAP_DEFAULT_XSLT_PATH share/openscap/xsl) ++set(OSCAP_DEFAULT_CPE_PATH share/openscap/cpe) + set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)") + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5d59bf3..d6919d0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -125,4 +125,8 @@ else() + set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + +-install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION}) ++install(TARGETS openscap ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index c372663..e0c8cc1 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -24,18 +24,11 @@ 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} + ) +- # Install all recursively dependent DLLs for oscap.exe +- set(APPS "\${CMAKE_INSTALL_PREFIX}/oscap.exe") # the \ before $ is required by BundleUtilities +- set(VCPKG_DLL_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin") +- install(CODE " +- include(BundleUtilities) +- fixup_bundle(\"${APPS}\" \"\" \"${VCPKG_DLL_DIR}\") +- ") + else() + set(OSCAP_UTIL_DESTINATION ${CMAKE_INSTALL_BINDIR}) + # Install the 'oscap' utility |