Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
a24746e6
Unverified
Commit
a24746e6
authored
Jul 16, 2021
by
Peter Eastman
Committed by
GitHub
Jul 16, 2021
Browse files
Fix build error on Mac (#3180)
parent
f5166695
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
45 deletions
+53
-45
CMakeLists.txt
CMakeLists.txt
+20
-18
plugins/amoeba/CMakeLists.txt
plugins/amoeba/CMakeLists.txt
+9
-7
plugins/drude/CMakeLists.txt
plugins/drude/CMakeLists.txt
+12
-10
plugins/rpmd/CMakeLists.txt
plugins/rpmd/CMakeLists.txt
+12
-10
No files found.
CMakeLists.txt
View file @
a24746e6
...
...
@@ -295,24 +295,26 @@ IF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
ENDIF
(
OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS
)
# On Linux need to link to libdl
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
IF
(
OPENMM_BUILD_SHARED_LIB
)
TARGET_LINK_LIBRARIES
(
${
SHARED_TARGET
}
${
DL_LIBRARY
}
${
PTHREADS_LIB
}
)
ENDIF
(
OPENMM_BUILD_SHARED_LIB
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_TARGET
}
${
DL_LIBRARY
}
${
PTHREADS_LIB
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
MARK_AS_ADVANCED
(
DL_LIBRARY
)
ELSE
(
DL_LIBRARY
)
IF
(
OPENMM_BUILD_SHARED_LIB
)
IF
(
ANDROID
)
TARGET_LINK_LIBRARIES
(
${
SHARED_TARGET
}
${
PTHREADS_LIB
}
cpufeatures
)
ELSE
(
ANDROID
)
TARGET_LINK_LIBRARIES
(
${
SHARED_TARGET
}
${
PTHREADS_LIB
}
)
ENDIF
(
ANDROID
)
ENDIF
(
OPENMM_BUILD_SHARED_LIB
)
ENDIF
(
DL_LIBRARY
)
IF
(
NOT APPLE
)
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
IF
(
OPENMM_BUILD_SHARED_LIB
)
TARGET_LINK_LIBRARIES
(
${
SHARED_TARGET
}
${
DL_LIBRARY
}
${
PTHREADS_LIB
}
)
ENDIF
(
OPENMM_BUILD_SHARED_LIB
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_TARGET
}
${
DL_LIBRARY
}
${
PTHREADS_LIB
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
MARK_AS_ADVANCED
(
DL_LIBRARY
)
ELSE
(
DL_LIBRARY
)
IF
(
OPENMM_BUILD_SHARED_LIB
)
IF
(
ANDROID
)
TARGET_LINK_LIBRARIES
(
${
SHARED_TARGET
}
${
PTHREADS_LIB
}
cpufeatures
)
ELSE
(
ANDROID
)
TARGET_LINK_LIBRARIES
(
${
SHARED_TARGET
}
${
PTHREADS_LIB
}
)
ENDIF
(
ANDROID
)
ENDIF
(
OPENMM_BUILD_SHARED_LIB
)
ENDIF
(
DL_LIBRARY
)
ENDIF
()
IF
(
BUILD_TESTING
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/tests
)
...
...
plugins/amoeba/CMakeLists.txt
View file @
a24746e6
...
...
@@ -106,13 +106,15 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
# ----------------------------------------------------------------------------
# On Linux need to link to libdl
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_AMOEBA_TARGET
}
${
DL_LIBRARY
}
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_AMOEBA_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
DL_LIBRARY
)
IF
(
NOT APPLE
)
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_AMOEBA_TARGET
}
${
DL_LIBRARY
}
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_AMOEBA_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
DL_LIBRARY
)
ENDIF
()
SET
(
OpenMMLib OpenMM
)
...
...
plugins/drude/CMakeLists.txt
View file @
a24746e6
...
...
@@ -80,16 +80,18 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
# ----------------------------------------------------------------------------
# On Linux need to link to libdl
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_TARGET
}
${
DL_LIBRARY
}
)
IF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_SERIALIZABLE_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_DRUDE_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
DL_LIBRARY
)
IF
(
NOT APPLE
)
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_TARGET
}
${
DL_LIBRARY
}
)
IF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_SERIALIZABLE_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_DRUDE_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
DL_LIBRARY
)
ENDIF
()
SET
(
OpenMMLib OpenMM
)
...
...
plugins/rpmd/CMakeLists.txt
View file @
a24746e6
...
...
@@ -84,16 +84,18 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
# ----------------------------------------------------------------------------
# On Linux need to link to libdl
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_RPMD_TARGET
}
${
DL_LIBRARY
}
)
IF
(
CREATE_SERIALIZABLE_OPENMM_RPMD
)
TARGET_LINK_LIBRARIES
(
${
SHARED_RPMD_SERIALIZABLE_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_RPMD
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_RPMD_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
DL_LIBRARY
)
IF
(
NOT APPLE
)
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_RPMD_TARGET
}
${
DL_LIBRARY
}
)
IF
(
CREATE_SERIALIZABLE_OPENMM_RPMD
)
TARGET_LINK_LIBRARIES
(
${
SHARED_RPMD_SERIALIZABLE_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_RPMD
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_RPMD_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
DL_LIBRARY
)
ENDIF
()
SET
(
OpenMMLib OpenMM
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment