Skip to content

Commit

Permalink
FindPystring: Also find a static pystring lib (#1449) (#1467)
Browse files Browse the repository at this point in the history
Signed-off-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>

Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
Signed-off-by: Patrick Hodoul <Patrick.Hodoul@autodesk.com>

Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
  • Loading branch information
3 people committed Aug 27, 2021
1 parent ecdc10c commit 9b9819f
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions share/cmake/modules/Findpystring.cmake
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

0 comments on commit 9b9819f

Please sign in to comment.