mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 06:59:01 +08:00
657d66a6cb
* [libraw] Re-fix non-thread-safe library installation, always export pkgconfig files, add usage * format manifest and version * Update ports/libraw/portfile.cmake * Update ports/libraw/portfile.cmake * Update ports/libraw/portfile.cmake * update version * version * Fix wrapper and usage * version * apply suggestions * version * Fix cmake install path * version * Fix usage * version
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 47f3869..136549b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -544,7 +544,7 @@ SET_TARGET_PROPERTIES(raw_r PROPERTIES OUTPUT_NAME "raw_r")
|
|
# -- Files to install -------------------------------------------------------------------------------------
|
|
|
|
# Configure and install data file for packaging.
|
|
-IF(NOT WIN32)
|
|
+IF(1)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc @ONLY)
|
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
|
|
|
@@ -570,8 +570,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libraw/libraw.h
|
|
# Install Shared binary files.
|
|
INSTALL(TARGETS raw
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}/manual-link
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}/manual-link
|
|
)
|
|
|
|
INSTALL(TARGETS raw_r
|
|
diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake
|
|
index aede5f2..ffeefc2 100644
|
|
--- a/cmake/data/libraw.pc.cmake
|
|
+++ b/cmake/data/libraw.pc.cmake
|
|
@@ -1,6 +1,6 @@
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=${prefix}
|
|
-libdir=${prefix}/lib@LIB_SUFFIX@
|
|
+libdir=${prefix}/lib@LIB_SUFFIX@/manual-link
|
|
includedir=${prefix}/include/libraw
|
|
|
|
Name: @PROJECT_NAME@
|