commit 10095119074669ba47b5073368404e5fe0deb19f
Author: Paolo Tosco <paolo.tosco.mail@gmail.com>
Date: Fri Jun 15 07:43:56 2018 +0100
- fixes the absence of the RDKit prefix in .so/.dylib libraries (#1915)
diff --git a/Code/cmake/Modules/RDKitUtils.cmake b/Code/cmake/Modules/RDKitUtils.cmake
index 25e00296..17912e92 100644
--- a/Code/cmake/Modules/RDKitUtils.cmake
+++ b/Code/cmake/Modules/RDKitUtils.cmake
@@ -74,13 +74,13 @@ macro(rdkit_library)
IF(RDKLIB_LINK_LIBRARIES)
target_link_libraries(${RDKLIB_NAME} PUBLIC ${RDKLIB_LINK_LIBRARIES})
ENDIF(RDKLIB_LINK_LIBRARIES)
- if(WIN32)
+ if((NOT MSVC) OR RDK_INSTALL_DLLS_MSVC)
set_target_properties(${RDKLIB_NAME} PROPERTIES
OUTPUT_NAME "RDKit${RDKLIB_NAME}"
VERSION "${RDKit_ABI}.${RDKit_Year}.${RDKit_Month}.${RDKit_Revision}"
VERSION ${RDKit_VERSION}
SOVERSION ${RDKit_ABI} )
- endif(WIN32)
+ endif()
set_target_properties(${RDKLIB_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${RDK_ARCHIVE_OUTPUT_DIRECTORY}
RUNTIME_OUTPUT_DIRECTORY ${RDK_RUNTIME_OUTPUT_DIRECTORY}