windows dlls, meet thy mxmake

This commit is contained in:
Vítor Santos Costa 2016-01-20 22:25:25 +00:00
parent f7207f3c9d
commit 3966bf2ee1
22 changed files with 99 additions and 37 deletions

4
.gitignore vendored
View File

@ -135,4 +135,6 @@ build
Debug
debug
Release
Build
Build
xcode
Threads

View File

@ -14,7 +14,9 @@ include_directories (H include ${CMAKE_BINARY_DIR} ${GMP_INCLUDE_DIR})
target_link_libraries(Yap++ libYap)
install(TARGETS Yap++
LIBRARY DESTINATION ${libdir} )
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir}
)
set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIR} )
#set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GMP_LIBRARIES} )

View File

@ -82,6 +82,7 @@ if (MPI_C_FOUND)
install(TARGETS yap_mpi
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)
endif (MPI_C_FOUND)

View File

@ -17,7 +17,8 @@ if (MATLAB_FOUND)
target_link_libraries(matlab libYap $(MATLAB_LIBRARIES) )
install(TARGETS matlab
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )
endif (MATLAB_FOUND)

View File

@ -6,5 +6,7 @@ target_link_libraries(matrix libYap)
set_target_properties (matrix PROPERTIES PREFIX "")
install(TARGETS matrix
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)

View File

@ -6,5 +6,6 @@ target_link_libraries(yap_random libYap)
set_target_properties (yap_random PROPERTIES PREFIX "")
install(TARGETS yap_random
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )

View File

@ -18,5 +18,6 @@ target_link_libraries(regexp libYap ${REGEX_SOURCES})
set_target_properties (regexp PROPERTIES PREFIX "")
install(TARGETS regexp
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )

View File

@ -11,5 +11,6 @@ target_link_libraries(yap_rl libYap)
set_target_properties (yap_rl PROPERTIES PREFIX "")
install(TARGETS yap_rl
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )

View File

@ -28,7 +28,8 @@ target_link_libraries(sys libYap)
set_target_properties (sys PROPERTIES PREFIX "")
install(TARGETS sys
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )
configure_file ("sys_config.h.cmake" "sys_config.h" )

View File

@ -0,0 +1,31 @@
/* Define to 1 if you have the <openssl/ripemd.h> header file. */
#ifndef HAVE_APACHE2_UTIL_MD5_H
/* #undef HAVE_APACHE2_UTIL_MD5_H */
#endif
/* Define to 1 if you have the <openssl/ripemd.h> header file. */
#ifndef HAVE_APR_1_APR_MD5_H
#define HAVE_APR_1_APR_MD5_H 1
#endif
/* Define to 1 if you have the <openssl/md5.h> header file. */
#ifndef HAVE_OPENSSL_MD5_H
/* #undef HAVE_OPENSSL_MD5_H */
#endif
/* Define to 1 if you have the <openssl/ripemd.h> header file. */
#ifndef HAVE_OPENSSL_RIPEMD_H
/* #undef HAVE_OPENSSL_RIPEMD_H */
#endif
/* "Define if you have the crypt function." */
#ifndef HAVE_CRYPT
/* #undef HAVE_CRYPT */
#endif
/* Define to 1 if you have the <crypt.h> header file. */
#ifndef HAVE_CRYPT_H
/* #undef HAVE_CRYPT_H */
#endif

0
library/systest.yap Normal file
View File

View File

@ -12,7 +12,8 @@ target_link_libraries(tries libYap)
set_target_properties (tries PROPERTIES PREFIX "")
install(TARGETS tries
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls})
set ( ITRIES_SOURCES
@ -28,5 +29,6 @@ target_link_libraries(itries libYap)
set_target_properties (itries PROPERTIES PREFIX "")
install(TARGETS itries
LIBRARY DESTINATION ${dlls} )
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )

View File

@ -90,6 +90,7 @@ endif( THRUST_INCLUDE_DIR )
install(TARGETS libcuda
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)
install(FILES ${PL_SOURCES}

View File

@ -46,6 +46,7 @@ if (GECODE_FOUND)
install(TARGETS gecode_yap
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)
install(FILES gecode.yap
@ -57,3 +58,4 @@ if (GECODE_FOUND)
)
endif (GECODE_FOUND)

View File

@ -4,13 +4,15 @@ set (JPL_SOURCES
src/c/jpl.c)
macro_optional_find_package(Java ON)
find_package(Java COMPONENTS Development)
#find_package(Java COMPONENTS Runtime)
find_package(Java )
# find_package(Java COMPONENTS Development)
# find_package(Java COMPONENTS Runtime)
#find_package(JavaLibs)
macro_log_feature (Java_Development_FOUND "Java"
"Use Java System"
"http://www.java.org" FALSE)
if (Java_Development_FOUND)
if (Java_FOUND)
# Java_JAVA_EXECUTABLE = the full path to the Java runtime
# Java_JAVAC_EXECUTABLE = the full path to the Java compiler
# Java_JAVAH_EXECUTABLE = the full path to the Java header generator
@ -45,33 +47,36 @@ if (Java_Development_FOUND)
# JAVA_INCLUDE_PATH2 = the include path to jni_md.h
# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
add_library (jplYap SHARED src/c/jpl.c)
if (JNI_FOUND)
add_subdirectory (src/java)
add_library(jplYap SHARED src/c/jpl.c)
include_directories (${JAVA_INCLUDE_DIRS} ${JNI_INCLUDE_DIRS})
add_subdirectory (src/java)
target_link_libraries(jplYap libYap ${JAVA_LIBRARIES} ${JNI_LIBRARIES})
include_directories (${JAVA_INCLUDE_DIRS} ${JNI_INCLUDE_DIRS})
#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${libdir};${dlls};${JAVA_JVM_LIBRARY}/..;${JAVA_JVM_LIBRARY}/..;" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
SET(CMAKE_INSTALL_RPATH "${libdir};${dlls}")
ENDIF("${isSystemDir}" STREQUAL "-1")
target_link_libraries(jplYap libYap ${JAVA_LIBRARIES} ${JNI_LIBRARIES})
#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${libdir};${dlls};${JAVA_JVM_LIBRARY}/..;${JAVA_JVM_LIBRARY}/..;" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
SET(CMAKE_INSTALL_RPATH "${libdir};${dlls}")
ENDIF("${isSystemDir}" STREQUAL "-1")
set_target_properties(jplYap PROPERTIES
OUTPUT_NAME jpl )
set_target_properties(jplYap PROPERTIES
OUTPUT_NAME jpl )
set(YAP_SYSTEM_OPTIONS "jpl " ${YAP_SYSTEM_OPTIONS} PARENT_SCOPE)
install(TARGETS jplYap
LIBRARY DESTINATION ${dlls}
)
install(TARGETS jplYap
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)
install(FILES jpl.pl
DESTINATION ${libpl}
)
endif(JNI_FOUND)
install(FILES jpl.pl
DESTINATION ${libpl}
)
endif (Java_Development_FOUND)
endif (Java_FOUND)

View File

@ -33,6 +33,7 @@ set_target_properties (Yapmysql PROPERTIES
install(TARGETS Yapmysql
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir}
)
else()

View File

@ -34,5 +34,6 @@ set_target_properties (Yapodbc PROPERTIES
install(TARGETS Yapodbc
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir}
)

View File

@ -30,6 +30,7 @@ if (PostgreSQL_FOUND)
install(TARGETS Yappostgres
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir}
)
else()
add_definitions (-DMYDDAS_PostgreSQL=0)

View File

@ -26,6 +26,7 @@ if (SQLITE3_FOUND)
install(TARGETS Yapsqlite3
LIBRARY DESTINATION ${libdir}
)
ARCHIVE DESTINATION ${libdir}
)
endif (SQLITE3_FOUND)

View File

@ -53,7 +53,8 @@ if (PYTHONLIBS_FOUND) # PYTHONLIBS_FOUND - have the Python l
install(TARGETS libpython
LIBRARY DESTINATION ${dlls}
)
ARCHIVE DESTINATION ${dlls}
)
install(FILES python.pl
DESTINATION ${libpl}

View File

@ -59,7 +59,8 @@ INCLUDE_DIRECTORIES(
install(TARGETS libxml2
LIBRARY DESTINATION ${dlls}
)
ARCHIVE DESTINATION ${dlls}
)
INSTALL(FILES xml2.yap DESTINATION ${libpl})
@ -106,6 +107,8 @@ IF (RAPTOR_FOUND)
install(TARGETS raptor
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)
INSTALL(FILES raptor.yap DESTINATION ${libpl})

View File

@ -37,4 +37,5 @@ set_target_properties (utf8proc PROPERTIES
install(TARGETS utf8proc
LIBRARY DESTINATION ${libdir} )
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir})