MFH: r561531

science/rdkit: fix packaging on powerpc64

Also switch not-working with Clang -mpopcntb with -mpopcntd (as a side effect it also raises requirements from POWER5 to POWER7).
This commit is contained in:
Piotr Kubaj 2021-01-14 03:05:49 +00:00
parent 96a2054710
commit 4327d46356
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2021Q1/; revision=561532
2 changed files with 16 additions and 6 deletions

View File

@ -1,6 +1,16 @@
--- CMakeLists.txt.orig 2018-10-22 02:29:34 UTC
--- CMakeLists.txt.orig 2020-12-12 08:00:55 UTC
+++ CMakeLists.txt
@@ -410,7 +410,7 @@ if(NOT RDK_INSTALL_INTREE)
@@ -68,7 +68,7 @@ if(NOT MSVC)
if(RDK_OPTIMIZE_POPCNT)
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
message("RDK_OPTIMIZE_POPCNT is not available on aarch64")
- elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntb")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntd")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt")
@@ -460,7 +460,7 @@ if(NOT RDK_INSTALL_INTREE)
PATTERN ".svn" EXCLUDE
)
install(DIRECTORY Docs DESTINATION

View File

@ -314,10 +314,10 @@ include/rdkit/RDGeneral/utils.h
include/rdkit/RDGeneral/versions.h
include/rdkit/RDStreams/streams.h
include/rdkit/RingDecomposerLib.h
include/rdkit/SimDivPickers/DistPicker.h
include/rdkit/SimDivPickers/HierarchicalClusterPicker.h
include/rdkit/SimDivPickers/LeaderPicker.h
include/rdkit/SimDivPickers/MaxMinPicker.h
%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/DistPicker.h
%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/HierarchicalClusterPicker.h
%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/LeaderPicker.h
%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/MaxMinPicker.h
lib/cmake/rdkit/rdkit-config-version.cmake
lib/cmake/rdkit/rdkit-config.cmake
lib/cmake/rdkit/rdkit-targets-%%CMAKE_BUILD_TYPE%%.cmake