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

6
packages/CLPBN/CMakeLists.txt
View File

@@ -100,15 +100,15 @@ ENDIF()
install(FILES
${CLPBN_TOP}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
install(FILES
${CLPBN_PL}
DESTINATION ${libpl}/clpbn
DESTINATION ${YAP_INSTALL_DATADIR}/clpbn
)
install(FILES
${CLPBN_LEARNING_PROGRAMS}
DESTINATION ${libpl}/clpbn/learning
DESTINATION ${YAP_INSTALL_DATADIR}/clpbn/learning
)

4
packages/CLPBN/horus/CMakeLists.txt
View File

@@ -69,7 +69,7 @@ if (CMAKE_MAJOR_VERSION GREATER 2)
install(TARGETS horus HorusCli
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
)
endif()

10
packages/CMakeLists.txt
View File

@@ -42,17 +42,17 @@ if (GECODE_FOUND)
include_directories (${GECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${GECODE_VERSION})
install(TARGETS gecode_yap
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}
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gecode.yap
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
install(FILES clpfd.yap
DESTINATION ${libpl}/gecode
DESTINATION ${YAP_INSTALL_DATADIR}/gecode
)
endif (GECODE_FOUND)

4
packages/ProbLog/CMakeLists.txt
View File

@@ -56,11 +56,11 @@ set (LIBRARY_PL
)
install(FILES ${PROGRAMS}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
install(FILES ${PROBLOG_PROGRAMS}
DESTINATION ${libpl}/problog
DESTINATION ${YAP_INSTALL_DATADIR}/problog
)

17
packages/bdd/CMakeLists.txt
View File

@@ -23,7 +23,6 @@ IF (CUDD_FOUND)
SET ( BDD_SOURCES
cudd.c
)
ADD_LIBRARY(cudd SHARED ${BDD_SOURCES} )
INCLUDE_DIRECTORIES(
@@ -49,18 +48,18 @@ IF (CUDD_FOUND)
add_subdirectory(simplecudd_lfi)
set(YAP_SYSTEM_OPTIONS "cudd " ${YAP_SYSTEM_OPTIONS} PARENT_SCOPE)
INSTALL(FILES ${CMAKE_BINARY_DIR}/cudd_config.h DESTINATION ${includedir})
INSTALL(FILES ${CMAKE_BINARY_DIR}/cudd_config.h DESTINATION ${YAP_INSTALL_INCLUDEDIR})
install(TARGETS cudd
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}
)
INSTALL(FILES bdd.yap DESTINATION ${libpl})
INSTALL(FILES ddnnf.yap DESTINATION ${libpl})
INSTALL(FILES simpbool.yap DESTINATION ${libpl})
INSTALL(FILES trie_sp.yap DESTINATION ${libpl})
INSTALL(FILES bdd.yap DESTINATION ${YAP_INSTALL_DATADIR})
INSTALL(FILES ddnnf.yap DESTINATION ${YAP_INSTALL_DATADIR})
INSTALL(FILES simpbool.yap DESTINATION ${YAP_INSTALL_DATADIR})
INSTALL(FILES trie_sp.yap DESTINATION ${YAP_INSTALL_DATADIR})
ENDIF (CUDD_FOUND)

4
packages/bdd/cmake/FindYAP.cmake
View File

@@ -5,9 +5,9 @@
if (YAP_ROOT)
set( YAP_INCLUDE_DIR ../../include )
set( YAP_PL_LIBRARY_DIR ${libpl} )
set( YAP_PL_LIBRARY_DIR ${YAP_INSTALL_DATADIR} )
set( YAP_LIBRARY libYap )
set( YAP_DLLS ${YAP_INSTALL_DLLDIR} )
set( YAP_DLLS ${YAP_INSTALL_LIBDIR} )
else()

2
packages/bdd/simplecudd/CMakeLists.txt
View File

@@ -26,6 +26,6 @@ target_link_libraries(Problogbdd
install(TARGETS Problogbdd
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)

2
packages/bdd/simplecudd_lfi/CMakeLists.txt
View File

@@ -30,6 +30,6 @@ target_link_libraries(Problogbdd-Lfi
install(TARGETS Problogbdd-Lfi
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)

2
packages/clpqr/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ set (CLPQRPRIV clpqr/class.pl clpqr/dump.pl
clpqr/project.pl clpqr/redund.pl)
set (LIBPL clpr.pl clpq.pl ${CLPRPRIV} ${CLPQPRIV} ${CLPQRPRIV} )
install ( FILES ${LIBPL} DESTINATION ${libpl} )
install ( FILES ${YAP_INSTALL_DATADIR} DESTINATION ${YAP_INSTALL_DATADIR} )
# $(PL) -q -f $(srcdir)/clpr_test.pl -g test,halt -t 'halt(1)'

22
packages/cplint/CMakeLists.txt
View File

@@ -148,9 +148,9 @@ IF (CUDD_FOUND)
)
install(TARGETS bddem
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}
)
@@ -171,15 +171,15 @@ IF (CUDD_FOUND)
add_subDIRECTORY ( approx/simplecuddLPADs )
install(TARGETS cplint
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}
)
INSTALL(FILES ${CPLINT_PROGRAMS} DESTINATION ${libpl})
INSTALL(FILES ${CPLINT_LEARNING_PROGRAMS} DESTINATION ${libpl}/cplint)
INSTALL(FILES ${CPLINT_EXAMPLE_PROGRAMS} DESTINATION ${libpl}/cplint/examples)
INSTALL(FILES ${CPLINT_TEST_PROGRAMS} DESTINATION ${libpl}/cplint/examples)
INSTALL(FILES ${CPLINT_SEMANTICS_PROGRAMS} DESTINATION ${libpl})
INSTALL(FILES ${CPLINT_PROGRAMS} DESTINATION ${YAP_INSTALL_DATADIR})
INSTALL(FILES ${CPLINT_LEARNING_PROGRAMS} DESTINATION ${YAP_INSTALL_DATADIR}/cplint)
INSTALL(FILES ${CPLINT_EXAMPLE_PROGRAMS} DESTINATION ${YAP_INSTALL_DATADIR}/cplint/examples)
INSTALL(FILES ${CPLINT_TEST_PROGRAMS} DESTINATION ${YAP_INSTALL_DATADIR}/cplint/examples)
INSTALL(FILES ${CPLINT_SEMANTICS_PROGRAMS} DESTINATION ${YAP_INSTALL_DATADIR})
ENDIF()

2
packages/cplint/approx/simplecuddLPADs/CMakeLists.txt
View File

@@ -27,6 +27,6 @@ target_link_libraries(LPADbdd
install(TARGETS LPADbdd
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)

6
packages/cuda/CMakeLists.txt
View File

@@ -103,12 +103,12 @@ endif( THRUST_INCLUDE_DIR )
)
install(TARGETS libcuda
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
)
install(FILES ${PL_SOURCES}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)

10
packages/gecode/CMakeLists.txt
View File

@@ -42,17 +42,17 @@ if (GECODE_FOUND)
include_directories (${GECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${GECODE_VERSION})
install(TARGETS gecode_yap
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}
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gecode.yap
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
install(FILES clpfd.yap
DESTINATION ${libpl}/gecode
DESTINATION ${YAP_INSTALL_DATADIR}/gecode
)
endif (GECODE_FOUND)

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} )

6
packages/myddas/mysql/CMakeLists.txt
View File

@@ -27,9 +27,9 @@ if (WITH_MYSQL)
add_lib(YAPmysql ${MYSQL_SOURCES})
target_link_libraries(YAPmysql ${MYSQL_LIBRARIES} libYap)
install(TARGETS YAPmysql
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)
endif()
include_directories(${MYSQL_INCLUDE_DIR} ..)

6
packages/myddas/odbc/CMakeLists.txt
View File

@@ -30,9 +30,9 @@ if (WITH_ODBC)
install(TARGETS YAPodbc
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}
)
else()

4
packages/myddas/pl/CMakeLists.txt
View File

@@ -14,7 +14,7 @@ set(MYDDAS_DRIVERS
if (ANDROID)
set (MYDDAS_PREFIX ${libpl} )
set (MYDDAS_PREFIX ${YAP_INSTALL_DATADIR} )
else()
set (MYDDAS_PREFIX ${CMAKE_CURRENT_BINARY_DIR} )
endif()
@@ -78,5 +78,5 @@ add_to_group(MYDDAS_YAP pl_library )
add_custom_target(plmyddas ALL DEPENDS ${MYDDAS_YAP} )
install(FILES ${MYDDAS_YAP}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)

6
packages/myddas/postgres/CMakeLists.txt
View File

@@ -30,9 +30,9 @@ if (WITH_POSTGRES)
-DMYDDAS_POSTGRES=1)
install(TARGETS YAPpostgres
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}
)
endif (PostgreSQL_FOUND)

10
packages/myddas/sqlite3/CMakeLists.txt
View File

@@ -52,21 +52,21 @@ if (WITH_SQLITE3)
set_target_properties(YAPsqlite3
PROPERTIES
# RPATH ${libdir} VERSION ${LIBYAPTAI_FULL_VERSION}
# RPATH ${CMAKE_INSTALL_LIBDIR} VERSION ${LIBYAPTAI_FULL_VERSION}
# SOVERSION ${LIBYAPTAI_MAJOR_VERSION}.${LIBYAPTAI_MINOR_VERSION}
POSITION_INDEPENDENT_CODE ON
PREFIX ""
)
install(TARGETS YAPsqlite3
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)
endif()
install(FILES ${SQLITE_EXTRA}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
endif()

14
packages/python/CMakeLists.txt
View File

@@ -28,9 +28,9 @@ target_link_libraries(Py4YAP libYap ${PYTHON_LIBRARIES})
install(TARGETS Py4YAP
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
)
@@ -46,13 +46,13 @@ set_property( SOURCE ${PYTHON_SOURCES} APPEND PROPERTY COMPILE_DEFINITIONS YA
set (PYTHON_PL python.pl)
install(FILES python.pl DESTINATION ${libpl} )
install(FILES python.pl DESTINATION ${YAP_INSTALL_DATADIR} )
add_to_group( PYTHON_PL pl_library )
set_target_properties (YAPPython PROPERTIES PREFIX "")
install(TARGETS YAPPython
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} )

4
packages/python/swig/CMakeLists.txt
View File

@@ -73,10 +73,10 @@ endif()
COMMAND ${PYTHON_EXECUTABLE} setup.py sdist ${bdist}
COMMAND ${PYTHON_EXECUTABLE} -m pip install ${PYTHON_USER_INSTALL} --ignore-installed .
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})"
DEPENDS Py4YAP ${CMAKE_BINARY_DIR}/${YAP_STARTUP} ${YAP_INSTALL_DLLDIR} )
DEPENDS Py4YAP ${CMAKE_BINARY_DIR}/${YAP_STARTUP} ${YAP_INSTALL_LIBDIR} )
install(FILES ${YAP4PY_PL} DESTINATION ${libpl} )
install(FILES ${YAP4PY_PL} DESTINATION ${YAP_INSTALL_DATADIR} )
add_to_group( YAP4PY_PL pl_library )

21
packages/python/swig/setup.py
View File

@@ -58,18 +58,18 @@ here = path.abspath(path.dirname(__file__))
sys.path.insert(0, "/home/vsc/github/yap-6.3/packages/python/swig")
python_libdir = path.abspath(path.dirname("/usr/lib/x86_64-linux-gnu/libpython3.6m.so"))
python_libdir = path.abspath(path.dirname("/usr/lib/libpython3.7m.so"))
if platform.system() == 'Windows':
local_libs = []
win_libs = ['wsock32','ws2_32']
my_extra_link_args = ['-Wl,-export-all-symbols']
elif platform.system() == 'Darwin':
my_extra_link_args = ['-L','..','-Wl,-rpath,'+abspath(join(sysconfig.get_path('platlib'),'yap4py')),'-Wl,-rpath,/lib','-Wl,-rpath,../yap4py']
my_extra_link_args = ['-L','..','-Wl,-rpath,'+abspath(join(sysconfig.get_path('platlib'),'yap4py')),'-Wl,-rpath,/usr/local/lib','-Wl,-rpath,../yap4py']
win_libs = []
local_libs = ['Py4YAP']
elif platform.system() == 'Linux':
my_extra_link_args = ['-L','..','-Wl,-rpath,'+abspath(join(sysconfig.get_path('platlib'),'yap4py')),'-Wl,-rpath,/lib','-Wl,-rpath,'+join('/lib','..'),'-Wl,-rpath,../yap4py']
my_extra_link_args = ['-L','..','-Wl,-rpath,'+abspath(join(sysconfig.get_path('platlib'),'yap4py')),'-Wl,-rpath,/usr/local/lib','-Wl,-rpath,'+join('/usr/local/lib','..'),'-Wl,-rpath,../yap4py']
win_libs = []
local_libs = ['Py4YAP']
@@ -78,22 +78,23 @@ elif platform.system() == 'Linux':
native_sources = ["yap4py/yap_wrap.cxx","yap4py/yapi.cpp"]
#gmp_dir = path.abspath(path.dirname("/usr/lib/x86_64-linux-gnu/libgmp.so"))
#gmp_dir = path.abspath(path.dirname("/lib/libgmp.so"))
# Get the long description from the README file
extensions = [Extension('_yap', native_sources,
define_macros=[('MAJOR_VERSION', '1'),
('MINOR_VERSION', '0'),
define_macros=[('MAJOR_VERSION', '6'),
('MINOR_VERSION', '4'),
('_YAP_NOT_INSTALLED_', '1'),
('YAP_PYTHON', '1'),
('PYTHONSWIG', '1'),
('_GNU_SOURCE', '1')],
runtime_library_dirs=[
abspath(join(sysconfig.get_path('platlib'),'yap4py')), abspath(sysconfig.get_path('platlib')),'/lib'],
abspath(join(sysconfig.get_path('platlib'),'yap4py')), abspath(sysconfig.get_path('platlib')),'/usr/local/lib'],
swig_opts=['-modern', '-c++', '-py3',
'-DX_API', '-Iyap4py/include' ],
library_dirs=[".",'../../..','/lib'],
library_dirs=[".",'../../..','/usr/local/lib'],
extra_link_args=my_extra_link_args,
libraries=['Yap','gmp']+win_libs+local_libs,
include_dirs=['/home/vsc/github/yap-6.3/H',
@@ -103,7 +104,7 @@ extensions = [Extension('_yap', native_sources,
'/home/vsc/github/yap-6.3/os',
'/home/vsc/github/yap-6.3/utf8proc',
'/home/vsc/github/yap-6.3/packages/python',
'../../..',
'/home/vsc/github/yap-6.3',
'/home/vsc/github/yap-6.3/CXX' ]
)]
@@ -114,7 +115,7 @@ package_data = {
data_files=[]
version_ns = {'__version__': '6.3.5', 'minor-version': '6', 'minor-version': '3', 'patch': '5'}
version_ns = {'__version__': '6.4.1', 'major-version': '6', 'minor-version': '4', 'patch': '1'}
setup_args = dict(
name=name,

2
packages/python/yap_kernel/CMakeLists.txt
View File

@@ -440,4 +440,4 @@ add_custom_target(YAP_KERNEL ALL
OUTPUT_VARIABLE setupOut
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
install(FILES ${PL_SOURCES} DESTINATION ${libpl} )
install(FILES ${PL_SOURCES} DESTINATION ${YAP_INSTALL_DATADIR} )

18
packages/raptor/CMakeLists.txt
View File

@@ -54,9 +54,9 @@ else (WIN32)
endif()
install(TARGETS libxml2
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif(WIN32)
@@ -67,7 +67,7 @@ endif(WIN32)
set_target_properties (libxml2 PROPERTIES PREFIX "")
INSTALL(FILES xml2.yap DESTINATION ${libpl})
INSTALL(FILES xml2.yap DESTINATION ${YAP_INSTALL_DATADIR})
ENDIF (LIBXML2_FOUND)
@@ -109,14 +109,14 @@ IF (RAPTOR_FOUND)
set_target_properties (raptor PROPERTIES PREFIX "")
install(TARGETS raptor
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
INSTALL(FILES raptor.yap DESTINATION ${libpl})
INSTALL(FILES rdf.yap DESTINATION ${libpl})
INSTALL(FILES raptor.yap DESTINATION ${YAP_INSTALL_DATADIR})
INSTALL(FILES rdf.yap DESTINATION ${YAP_INSTALL_DATADIR})
configure_file ("raptor_config.h.cmake" "raptor_config.h" )

4
packages/raptor/cmake/FindYAP.cmake
View File

@@ -5,9 +5,9 @@
if (YAP_ROOT)
set( YAP_INCLUDE_DIR ../../include )
set( YAP_PL_LIBRARY_DIR ${libpl} )
set( YAP_PL_LIBRARY_DIR ${YAP_INSTALL_DATADIR} )
set( YAP_LIBRARY libYap )
set( YAP_DLLS ${YAP_INSTALL_DLLDIR} )
set( YAP_DLLS ${YAP_INSTALL_LIBDIR} )
else()

8
packages/real/CMakeLists.txt
View File

@@ -38,13 +38,13 @@ include_directories (
configure_file ("rconfig.h.cmake" "rconfig.h" )
install(TARGETS real
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)
install(FILES real.pl
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
endif()

4
packages/swi-minisat2/C/CMakeLists.txt
View File

@@ -44,8 +44,8 @@ pl-minisat.C
install (
TARGETS minisat2
RUNTIME DESTINATION ${CMAKE_INSTALL_BIINDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_DLLDIR}
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
)

2
packages/swi-minisat2/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ set (EXAMPLE_PROGRAMS
install(FILES
${PROGRAMS}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)
add_subDIRECTORY (C)

14
packages/swig/android/CMakeLists.txt
View File

@@ -18,20 +18,20 @@ FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/jni)
add_custom_target (pllib
COMMAND ${CMAKE_COMMAND} -E make_directory ${pllib}
COMMAND ${CMAKE_COMMAND} -E copy ${pl_library} ${pllib}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/android.yap ${pllib}
COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}
COMMAND ${CMAKE_COMMAND} -E copy ${pl_library} ${YAP_INSTALL_DATADIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/android.yap ${YAP_INSTALL_DATADIR}
DEPENDS ${pl_library}
)
add_custom_target (pllibpl
COMMAND ${CMAKE_COMMAND} -E make_directory ${pllib}/pl
COMMAND ${CMAKE_COMMAND} -E copy ${pl_boot_library} ${pllib}/pl
COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}/pl
COMMAND ${CMAKE_COMMAND} -E copy ${pl_boot_library} ${YAP_INSTALL_DATADIR}/pl
DEPENDS pllib ${pl_boot_library}
)
add_custom_target (pllibos ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${pllib}/os
COMMAND ${CMAKE_COMMAND} -E copy ${pl_os_library} ${pllib}/os
COMMAND ${CMAKE_COMMAND} -E make_directory ${YAP_INSTALL_DATADIR}/os
COMMAND ${CMAKE_COMMAND} -E copy ${pl_os_library} ${YAP_INSTALL_DATADIR}/os
DEPENDS pllibpl ${pl_os_library}
)

10
packages/swig/java/CMakeLists.txt
View File

@@ -45,7 +45,7 @@ if (JNI_FOUND)
DEPENDS Native
PROPERTIES OUTPUT_NAME Native
)
install_jar(NativeJar ${libpl})
install_jar(NativeJar ${YAP_INSTALL_DATADIR})
add_dependencies(NativeJar Native )
#install_jni_symlink(NativeJar .)
@@ -65,12 +65,12 @@ if (JNI_FOUND)
SET(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8")
install( TARGETS Native
RUNTIME DESTINATION ${CMAKE_INSTALL_BIINDIR}
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install_jar(JavaYAP ${libpl})
#install_jni_symlink(JavaYAP ${libpl})
install_jar(JavaYAP ${YAP_INSTALL_DATADIR})
#install_jni_symlink(JavaYAP ${YAP_INSTALL_DATADIR})

14
packages/swig/js/CMakeLists.txt
View File

@@ -56,7 +56,7 @@ if (Java_Development_FOUND)
DEPENDS Native
PROPERTIES OUTPUT_NAME Native
)
install_jar(NativeJar ${libpl})
install_jar(NativeJar ${YAP_INSTALL_DATADIR})
add_dependencies(NativeJar Native )
#install_jni_symlink(NativeJar .)
@@ -73,15 +73,15 @@ if (Java_Development_FOUND)
SOURCES "JavaYAP.java"
ENTRY_POINT JavaYAP
INCLUDE_JARS NativeJar )
SET(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8")
SET(CMAKE_JAVA_COMPILE_FLAGS)
install( TARGETS Native
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${libdir}
RUNTIME DESTINATION ${CMAKE_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_DLLDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_DLLDIR}
)
install_jar(JavaYAP ${libpl})
#install_jni_symlink(JavaYAP ${libpl})
install_jar(JavaYAP ${YAP_INSTALL_DATADIR})
#install_jni_symlink(JavaYAP ${YAP_INSTALL_DATADIR})

4
packages/xml/CMakeLists.txt
View File

@@ -37,9 +37,9 @@ add_custom_target (xmlpl SOURCES ${XML_PL} ${LIBRARY_PL} ) # WORKING_DIRECTORY $
install(FILES ${LIBRARY_PL}
DESTINATION ${libpl}/xml
DESTINATION ${YAP_INSTALL_DATADIR}/xml
)
install(FILES ${XML_PL}
DESTINATION ${libpl}
DESTINATION ${YAP_INSTALL_DATADIR}
)

8
packages/yap-lbfgs/CMakeLists.txt
View File

@@ -35,11 +35,11 @@ ENDIF (NOT YAP_FOUND)
install(TARGETS LBFGS
LIBRARY DESTINATION ${YAP_INSTALL_DLLDIR}
RUNTIME DESTINATION ${YAP_INSTALL_DLLDIR}
ARCHIVE DESTINATION ${libdir}
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
)
INSTALL(FILES lbfgs.pl DESTINATION ${libpl})
INSTALL(FILES lbfgs.pl DESTINATION ${YAP_INSTALL_DATADIR})