Skip to content

GitLab

Unverified Commit a24746e6 authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

Fix build error on Mac (#3180)

parent f5166695
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 45 deletions
CMakeLists.txt
View file @ a24746e6
...@@ -295,24 +295,26 @@ IF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS) ...@@ -295,24 +295,26 @@ IF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS) ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
# On Linux need to link to libdl # On Linux need to link to libdl
FIND_LIBRARY(DL_LIBRARY dl) IF(NOT APPLE)
IF(DL_LIBRARY) FIND_LIBRARY(DL_LIBRARY dl)
IF(OPENMM_BUILD_SHARED_LIB) IF(DL_LIBRARY)
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${DL_LIBRARY} ${PTHREADS_LIB}) IF(OPENMM_BUILD_SHARED_LIB)
ENDIF(OPENMM_BUILD_SHARED_LIB) TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${DL_LIBRARY} ${PTHREADS_LIB})
IF(OPENMM_BUILD_STATIC_LIB) ENDIF(OPENMM_BUILD_SHARED_LIB)
TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${DL_LIBRARY} ${PTHREADS_LIB}) IF(OPENMM_BUILD_STATIC_LIB)
ENDIF(OPENMM_BUILD_STATIC_LIB) TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${DL_LIBRARY} ${PTHREADS_LIB})
MARK_AS_ADVANCED(DL_LIBRARY) ENDIF(OPENMM_BUILD_STATIC_LIB)
ELSE(DL_LIBRARY) MARK_AS_ADVANCED(DL_LIBRARY)
IF(OPENMM_BUILD_SHARED_LIB) ELSE(DL_LIBRARY)
IF (ANDROID) IF(OPENMM_BUILD_SHARED_LIB)
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${PTHREADS_LIB} cpufeatures) IF (ANDROID)
ELSE (ANDROID) TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${PTHREADS_LIB} cpufeatures)
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${PTHREADS_LIB}) ELSE (ANDROID)
ENDIF (ANDROID) TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${PTHREADS_LIB})
ENDIF(OPENMM_BUILD_SHARED_LIB) ENDIF (ANDROID)
ENDIF(DL_LIBRARY) ENDIF(OPENMM_BUILD_SHARED_LIB)
ENDIF(DL_LIBRARY)
ENDIF()
IF(BUILD_TESTING) IF(BUILD_TESTING)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/tests) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/tests)
......
plugins/amoeba/CMakeLists.txt
View file @ a24746e6
...@@ -106,13 +106,15 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS) ...@@ -106,13 +106,15 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# On Linux need to link to libdl # On Linux need to link to libdl
FIND_LIBRARY(DL_LIBRARY dl) IF(NOT APPLE)
IF(DL_LIBRARY) FIND_LIBRARY(DL_LIBRARY dl)
TARGET_LINK_LIBRARIES(${SHARED_AMOEBA_TARGET} ${DL_LIBRARY}) IF(DL_LIBRARY)
IF(OPENMM_BUILD_STATIC_LIB) TARGET_LINK_LIBRARIES(${SHARED_AMOEBA_TARGET} ${DL_LIBRARY})
TARGET_LINK_LIBRARIES(${STATIC_AMOEBA_TARGET} ${DL_LIBRARY}) IF(OPENMM_BUILD_STATIC_LIB)
ENDIF(OPENMM_BUILD_STATIC_LIB) TARGET_LINK_LIBRARIES(${STATIC_AMOEBA_TARGET} ${DL_LIBRARY})
ENDIF(DL_LIBRARY) ENDIF(OPENMM_BUILD_STATIC_LIB)
ENDIF(DL_LIBRARY)
ENDIF()
SET( OpenMMLib OpenMM ) SET( OpenMMLib OpenMM )
......
plugins/drude/CMakeLists.txt
View file @ a24746e6
...@@ -80,16 +80,18 @@ ENDIF(OPENMM_BUILD_STATIC_LIB) ...@@ -80,16 +80,18 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# On Linux need to link to libdl # On Linux need to link to libdl
FIND_LIBRARY(DL_LIBRARY dl) IF(NOT APPLE)
IF(DL_LIBRARY) FIND_LIBRARY(DL_LIBRARY dl)
TARGET_LINK_LIBRARIES(${SHARED_DRUDE_TARGET} ${DL_LIBRARY}) IF(DL_LIBRARY)
IF( CREATE_SERIALIZABLE_OPENMM_DRUDE ) TARGET_LINK_LIBRARIES(${SHARED_DRUDE_TARGET} ${DL_LIBRARY})
TARGET_LINK_LIBRARIES(${SHARED_DRUDE_SERIALIZABLE_TARGET} ${DL_LIBRARY}) IF( CREATE_SERIALIZABLE_OPENMM_DRUDE )
ENDIF( CREATE_SERIALIZABLE_OPENMM_DRUDE ) TARGET_LINK_LIBRARIES(${SHARED_DRUDE_SERIALIZABLE_TARGET} ${DL_LIBRARY})
IF(OPENMM_BUILD_STATIC_LIB) ENDIF( CREATE_SERIALIZABLE_OPENMM_DRUDE )
TARGET_LINK_LIBRARIES(${STATIC_DRUDE_TARGET} ${DL_LIBRARY}) IF(OPENMM_BUILD_STATIC_LIB)
ENDIF(OPENMM_BUILD_STATIC_LIB) TARGET_LINK_LIBRARIES(${STATIC_DRUDE_TARGET} ${DL_LIBRARY})
ENDIF(DL_LIBRARY) ENDIF(OPENMM_BUILD_STATIC_LIB)
ENDIF(DL_LIBRARY)
ENDIF()
SET( OpenMMLib OpenMM ) SET( OpenMMLib OpenMM )
......
plugins/rpmd/CMakeLists.txt
View file @ a24746e6
...@@ -84,16 +84,18 @@ ENDIF(OPENMM_BUILD_STATIC_LIB) ...@@ -84,16 +84,18 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# On Linux need to link to libdl # On Linux need to link to libdl
FIND_LIBRARY(DL_LIBRARY dl) IF(NOT APPLE)
IF(DL_LIBRARY) FIND_LIBRARY(DL_LIBRARY dl)
TARGET_LINK_LIBRARIES(${SHARED_RPMD_TARGET} ${DL_LIBRARY}) IF(DL_LIBRARY)
IF( CREATE_SERIALIZABLE_OPENMM_RPMD ) TARGET_LINK_LIBRARIES(${SHARED_RPMD_TARGET} ${DL_LIBRARY})
TARGET_LINK_LIBRARIES(${SHARED_RPMD_SERIALIZABLE_TARGET} ${DL_LIBRARY}) IF( CREATE_SERIALIZABLE_OPENMM_RPMD )
ENDIF( CREATE_SERIALIZABLE_OPENMM_RPMD ) TARGET_LINK_LIBRARIES(${SHARED_RPMD_SERIALIZABLE_TARGET} ${DL_LIBRARY})
IF(OPENMM_BUILD_STATIC_LIB) ENDIF( CREATE_SERIALIZABLE_OPENMM_RPMD )
TARGET_LINK_LIBRARIES(${STATIC_RPMD_TARGET} ${DL_LIBRARY}) IF(OPENMM_BUILD_STATIC_LIB)
ENDIF(OPENMM_BUILD_STATIC_LIB) TARGET_LINK_LIBRARIES(${STATIC_RPMD_TARGET} ${DL_LIBRARY})
ENDIF(DL_LIBRARY) ENDIF(OPENMM_BUILD_STATIC_LIB)
ENDIF(DL_LIBRARY)
ENDIF()
SET( OpenMMLib OpenMM ) SET( OpenMMLib OpenMM )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment