This commit is contained in:
Vitor Santos Costa 2018-05-22 21:40:11 +01:00
parent 518ce92bea
commit ce2185e162
2 changed files with 11 additions and 10 deletions

View File

@ -67,20 +67,21 @@ set (MPI_YAP_SOURCES
# program, EXECUTABLE is the MPI program, and ARGS are the arguments to
# pass to the MPI program.
#
add_lib(yap_mpi ${MPI_YAP_SOURCES})
add_executable (yap_mpi ${MPI_YAP_SOURCES} ../../console/yap.c)
target_link_libraries(yap_mpi libYap ${MPI_C_LIBRARIES})
target_link_libraries(yap_mpi libYap)
set_target_properties (yap_mpi PROPERTIES PREFIX "")
include_directories( ${MPI_C_INCLUDE_PATH})
include_directories (${MPI_C_INCLUDE_PATH})
add_definitions (-DHAVE_MPI_H=1)
target_compile_definitions(yap_mpi
PRIVATE ${MPI_C_COMPILE_FLAGS})
set_property( DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS HAVE_MPI_H=1)
target_compile_options(yap_mpi
PUBLIC ${MPI_C_COMPILE_FLAGS})
install(TARGETS yap_mpi
RUNTIME DESTINATION ${bindir}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
)
endif (MPI_C_FOUND)

View File

@ -315,9 +315,9 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/prolo
)
add_custom_target(YAP_KERNEL ALL
COMMAND ${CMAKE_COMMAND} -E tar xzf yap.tgz
COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_CURRENT_BINARY_DIR}/yap.tgz
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-64x64.png yap.tgz ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/kernel.js ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/prolog.js
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-64x64.png yap.tgz ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/kernel.js ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/prolog.js ${CMAKE_CURRENT_BINARY_DIR}/yap.tgz
)