Skip to content

FindPystring: Also find a static pystring lib #1449

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

Merged
michdolan merged 3 commits into from
Aug 18, 2021
Merged

FindPystring: Also find a static pystring lib #1449

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f625f0
FindPystring: Also find a static pystring lib
autoantwort Aug 5, 2021
de7e046
Merge branch 'master' into fix-static-pystring
hodoulp Aug 17, 2021
0351c42
Merge branch 'master' into fix-static-pystring
hodoulp Aug 18, 2021
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
12 changes: 1 addition & 11 deletions share/cmake/modules/Findpystring.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
# Targets defined by this module:
# pystring::pystring - IMPORTED target, if found
#
# By default, the dynamic libraries of pystring will be found. To find the
# static ones instead, you must set the pystring_STATIC_LIBRARY variable to
# TRUE before calling find_package(pystring ...).
#
# If pystring is not installed in a standard path, you can use the
# pystring_ROOT variable to tell CMake where to find it. If it is not found
# and OCIO_INSTALL_EXT_PACKAGES is set to MISSING or ALL, pystring will be
Expand All @@ -41,16 +37,10 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
pystring/include
)

# Attempt to find static library first if this is set
if(pystring_STATIC_LIBRARY)
set(_pystring_STATIC
"${CMAKE_STATIC_LIBRARY_PREFIX}pystring${CMAKE_STATIC_LIBRARY_SUFFIX}")
endif()

# Find library
find_library(pystring_LIBRARY
NAMES
${_pystring_STATIC} pystring
pystring libpystring
HINTS
${_pystring_SEARCH_DIRS}
PATH_SUFFIXES
Expand Down