2018-05-23 14:50:20 +00:00
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
2018-05-25 06:42:45 +00:00
index 0a2920e4..b9388182 100644
2018-05-23 14:50:20 +00:00
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
2018-05-25 06:42:45 +00:00
@@ -104,7 +104,8 @@ if(MSVC)
2018-05-25 05:37:57 +00:00
set(CLANG_LIB_NAMES libclang)
endif()
-find_library(CLANG_LIBRARY NAMES ${CLANG_LIB_NAMES} HINTS ${CLANG_DIR}/lib)
2018-05-25 06:42:45 +00:00
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
2018-05-25 05:37:57 +00:00
+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}.\
2018-05-25 06:42:45 +00:00
@@ -114,7 +115,7 @@ endif()
2018-05-23 14:50:20 +00:00
message(STATUS "CLANG: ${CLANG_DIR}, ${CLANG_LIBRARY} detected by ${CLANG_DIR_SOURCE}")
# Find highest version clang builtin includes folder to pass along to shiboken.
-set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib/clang)
2018-05-25 05:37:57 +00:00
+set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib${LIB_SUFFIX}/clang)
file(GLOB CLANG_BUILTIN_INCLUDES_DIR_CANDIDATES "${CLANG_BUILTIN_INCLUDES_DIR_PREFIX}/*")
2018-05-23 14:50:20 +00:00
2018-05-25 05:37:57 +00:00
# Collect only directories, and not files, and only directories starting with a number.
2018-05-25 06:42:45 +00:00
@@ -303,7 +304,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)
