forked from pool/python3-pyside2
36 lines
1.9 KiB
Diff
36 lines
1.9 KiB
Diff
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
|
|
index 1af84fc..843761f 100644
|
|
--- a/sources/shiboken2/CMakeLists.txt
|
|
+++ b/sources/shiboken2/CMakeLists.txt
|
|
@@ -104,7 +104,8 @@ if(MSVC)
|
|
set(CLANG_LIB_NAMES libclang)
|
|
endif()
|
|
|
|
-find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib)
|
|
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
+find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib${LIB_SUFFIX})
|
|
if (NOT EXISTS ${CLANG_LIBRARY})
|
|
string(REPLACE ";" ", " CLANG_LIB_NAMES_STRING "${CLANG_LIB_NAMES}")
|
|
message(FATAL_ERROR "Unable to find the Clang library in ${CLANG_DIR}.\
|
|
@@ -311,7 +312,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
|
|
set(CMAKE_CXX_STANDARD 11)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
|
|
|
|
if (WIN32)
|
|
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
index 74cad05..ff02e6d 100644
|
|
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
@@ -268,7 +268,7 @@ static QString findClangBuiltInIncludesDir()
|
|
if (!clangPath.isEmpty()) {
|
|
QString candidate;
|
|
QVersionNumber lastVersionNumber(1, 0, 0);
|
|
- QDir clangDir(clangPath + QLatin1String("/lib/clang"));
|
|
+ QDir clangDir(clangPath + QLatin1String("/lib64/clang"));
|
|
const QFileInfoList versionDirs =
|
|
clangDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
|
|
for (const QFileInfo &fi : versionDirs) {
|