mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 05:38:59 +08:00
1d8133122b
* [openexr] fixup pkgconfig * [openexr] x-add-version * [openexr] drop _d library suffix for debug builds (ensures correct .pc file) * [openexr] x-add-version * [openexr] rename patches in order, add pkg-config debug suffix patch * [openexr] x-add-version * [openexr] update patch to match upstream PR * [openexr] x-add-version
41 lines
2.5 KiB
Diff
41 lines
2.5 KiB
Diff
diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake
|
|
index 44254a7..1f5d2a6 100644
|
|
--- a/IlmBase/config/LibraryDefine.cmake
|
|
+++ b/IlmBase/config/LibraryDefine.cmake
|
|
@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname)
|
|
if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL ""))
|
|
set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
- if(WIN32)
|
|
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
|
|
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
|
|
- else()
|
|
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
|
|
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
|
|
- endif()
|
|
- set(verlibname)
|
|
- set(baselibname)
|
|
endif()
|
|
|
|
if(ILMBASE_BUILD_BOTH_STATIC_SHARED)
|
|
diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake
|
|
index a9561dc..42853af 100644
|
|
--- a/OpenEXR/config/LibraryDefine.cmake
|
|
+++ b/OpenEXR/config/LibraryDefine.cmake
|
|
@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname)
|
|
if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL ""))
|
|
set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
- if(WIN32)
|
|
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
|
|
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
|
|
- else()
|
|
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
|
|
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
|
|
- endif()
|
|
- set(verlibname)
|
|
- set(baselibname)
|
|
endif()
|
|
|
|
if(OPENEXR_BUILD_BOTH_STATIC_SHARED)
|