Skip to content

Commit 9b9819f

Browse files
hodoulpautoantwortmichdolan
authored
FindPystring: Also find a static pystring lib (#1449) (#1467)
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>
1 parent ecdc10c commit 9b9819f

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

share/cmake/modules/Findpystring.cmake

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
# Targets defined by this module:
1212
# pystring::pystring - IMPORTED target, if found
1313
#
14-
# By default, the dynamic libraries of pystring will be found. To find the
15-
# static ones instead, you must set the pystring_STATIC_LIBRARY variable to
16-
# TRUE before calling find_package(pystring ...).
17-
#
1814
# If pystring is not installed in a standard path, you can use the
1915
# pystring_ROOT variable to tell CMake where to find it. If it is not found
2016
# and OCIO_INSTALL_EXT_PACKAGES is set to MISSING or ALL, pystring will be
@@ -41,16 +37,10 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
4137
pystring/include
4238
)
4339

44-
# Attempt to find static library first if this is set
45-
if(pystring_STATIC_LIBRARY)
46-
set(_pystring_STATIC
47-
"${CMAKE_STATIC_LIBRARY_PREFIX}pystring${CMAKE_STATIC_LIBRARY_SUFFIX}")
48-
endif()
49-
5040
# Find library
5141
find_library(pystring_LIBRARY
5242
NAMES
53-
${_pystring_STATIC} pystring
43+
pystring libpystring
5444
HINTS
5545
${_pystring_SEARCH_DIRS}
5646
PATH_SUFFIXES

0 commit comments

Comments
 (0)