Skip to content

Commit

Permalink
update from ambertools
Browse files Browse the repository at this point in the history
  • Loading branch information
hainm committed May 19, 2021
1 parent 3d844a4 commit bbd168a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ install(CODE "
${PYTHONPATH_SET_CMD}
${PYTHON_EXECUTABLE} ./setup.py build -b ${BUILD_DIR} ${OPENMP_ARG} ${PYTHON_COMPILER_ARG} ${WIN64_DEFINE_ARG} install ${PYTHON_PREFIX_ARG}
WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")

add_subdirectory(tests)
2 changes: 1 addition & 1 deletion pytraj/externals/magic.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def errorcheck_null(result, func, args):


def errorcheck_negative_one(result, func, args):
if result is -1:
if result == -1:
err = magic_error(args[0])
raise MagicException(err)
else:
Expand Down
2 changes: 2 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# install to full path inside AmberTools directory
install(DIRECTORY . USE_SOURCE_PERMISSIONS DESTINATION AmberTools/src/pytraj/tests/ COMPONENT Tests ${TESTS_EXCLUDE_OPTION})

0 comments on commit bbd168a

Please sign in to comment.