Skip to content

Fix linking to self-built deps on Windows + Clang #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dimula73 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix linking to self-built deps on Windows + Clang #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions share/cmake/modules/install/InstallZLIB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ if(NOT ZLIB_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACKAGE

set(ZLIB_INCLUDE_DIRS "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}")

# Windows need the "d" suffix at the end.
if(WIN32 AND BUILD_TYPE_DEBUG)
# Windows need the "d" suffix at the end (only for MSVC).
if(MSVC AND BUILD_TYPE_DEBUG)
set(_ZLIB_LIB_SUFFIX "d")
endif()

Expand Down
8 changes: 5 additions & 3 deletions share/cmake/modules/install/Installexpat.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ if(NOT expat_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACKAG
if(BUILD_TYPE_DEBUG)
set(_expat_LIB_SUFFIX "d")
endif()
# Static Linking, Multi-threaded Dll naming (>=2.2.8):
# https://github.com/libexpat/libexpat/blob/R_2_2_8/expat/win32/README.txt
set(_expat_LIB_SUFFIX "${_expat_LIB_SUFFIX}MD")
if (MSVC)
# Static Linking, Multi-threaded Dll naming (>=2.2.8):
# https://github.com/libexpat/libexpat/blob/R_2_2_8/expat/win32/README.txt
set(_expat_LIB_SUFFIX "${_expat_LIB_SUFFIX}MD")
endif()
endif()

# Expat use a hardcoded lib prefix instead of CMAKE_STATIC_LIBRARY_PREFIX
Expand Down