diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake

Browse Source
This commit is contained in:
Vitor Santos Costa
2018-11-16 14:02:56 +00:00
parent fc65bd6924
commit e89bc55b9f
65 changed files with 247 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/jpl/CMakeLists.txt
View File

@@ -16,7 +16,7 @@ if (Java_Development_FOUND)
add_subdirectory (src/java)
install(FILES jpl.pl
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
endif (Java_Development_FOUND)

4
packages/jpl/jpl.pl
View File

@@ -4701,11 +4701,11 @@ java_home(Home) :-
setup_jvm :-
jvm_ready, !.
setup_jvm :-
check_java_libs(JVM, Java),
check_java_libs(_JVM, _Java),
add_jpl_to_classpath,
libjpl(JPL),
add_jpl_to_ldpath(JPL,FullJPL),
catch(load_absolute_foreign_files([FullJPL],[Java,JVM],install), E, report_java_setup_problem(E)),
catch(load_absolute_foreign_files([FullJPL],[],install), E, report_java_setup_problem(E)),
assert(jvm_ready).
report_java_setup_problem(E) :-

23
packages/jpl/src/c/CMakeLists.txt
View File

@@ -5,22 +5,7 @@ add_lib(jplYap jpl.h jpl.c hacks.h)
include_directories (${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_PATH} )
get_filename_component ( JAVA_AWT_DIR ${JAVA_AWT_LIBRARY} DIRECTORY)
get_filename_component ( JAVA_JNI_DIR ${JAVA_JVM_LIBRARY} DIRECTORY)
list(APPEND CMAKE_INSTALL_RPATH ${JAVA_AWT_DIR};${JAVA_JNI_DIR})
if (APPLE)
set(CMAKE_MACOSX_RPATH 1)
find_library (JLI jli ${JAVA_AWT_DIR}/jli)
find_library (JAL JavaApplicationLauncher FRAMEWORK ONLY PATH /System/Library/PrivateFrameworks)
find_library (JL JavaLaunching FRAMEWORK ONLY PATH /System/Library/PrivateFrameworks)
list(APPEND CMAKE_INSTALL_RPATH ${JAVA_AWT_DIR}/jli)
target_link_libraries(jplYap libYap ${JL} ${JAL} -L${JAVA_AWT_DIR}/jli -ljli )
else()
target_link_libraries(jplYap libYap ${JAVA_JVM_LIBRARY})
endif()
target_link_libraries(jplYap libYap ${JNI_LIBRARIES})
set_target_properties(jplYap PROPERTIES
OUTPUT_NAME jpl
@@ -28,7 +13,7 @@ endif()
# set(YAP_SYSTEM_OPTIONS "jpl " ${YAP_SYSTEM_OPTIONS} PARENT_SCOPE)
install(TARGETS jplYap
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
)

2
packages/jpl/src/java/CMakeLists.txt
View File

@@ -81,4 +81,4 @@ add_jar(jpl
SOURCES ${JPLJAVA}
OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
install_jar(jpl ${libpl} )
install_jar(jpl ${YAP_INSTALL_DATADIR} )