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

Merge branch 'josephnunn-merge'

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-06-04 22:24:16 +01:00
commit 00cfb6e432
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -276,7 +276,7 @@ add_library(libYap
${YAP_MODULES} ${YAP_MODULES}
) )
set_property(DIRECTORY PROPERTY CXX_STANDARD 11) set_property(DIRECTORY PROPERTY CXX_STANDARD 11)
@ -303,8 +303,8 @@ set(CMAKE_TOP_BINARY_DIR ${CMAKE_BINARY_DIR})
set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl) set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl)
# Compatibility vars with autotols # Compatibility vars with autotols
if (ANDROID) if (0)
set ( prefix "${CMAKE_SOURCE_DIR}/app/src/main") set ( prefix "${CMAKE_SOURCE_DIR}/android/app/build/generated")
set ( exec_prefix "${prefix}") set ( exec_prefix "${prefix}")
set ( libdir "${exec_prefix}/jniLibs/${ANDROID_ABI}") set ( libdir "${exec_prefix}/jniLibs/${ANDROID_ABI}")
set ( dlls "${libdir}") set ( dlls "${libdir}")
@ -612,10 +612,8 @@ option (WITH_DOCS
# add_subDIRECTORY (docs) # add_subDIRECTORY (docs)
# add_subDIRECTORY (packages/cuda) # add_subDIRECTORY (packages/cuda)
add_subDIRECTORY (packages/gecode) add_subDIRECTORY (packages/gecode)
add_subDIRECTORY (packages/real) add_subDIRECTORY (packages/real)

19
INSTALL.md
View File

@ -11,20 +11,21 @@ Compiling YAP {#CompilingYAP}
To compile YAP it should be sufficient to: To compile YAP it should be sufficient to:
2 create a directory, say `Build` and `cd` to the directory (`cd Build`). 0: Install a version of `cmake` 3.0 or above, if you don't have it, and add it to your path, you can find it here: https://cmake.org/
* OSX: Create a symbolic link to the command line executables in
/usr/local/bin (which should be on your path) with `sudo ln -s /Applications/CMake.app/Contents/bin/* /usr/local/bin/`
obs: avoid compiling YAP in the src directory, some packages do not allow for that. 1: Create a directory, say `Build` and `cd` to the directory (`cd Build`).
* Avoid compiling YAP in the src directory, some packages do not allow for that.
1 run `cmake`, ideally using a cmake above 3.0. 2: Run `cmake ../` from within `Build` (or equivalent)
2 `make`. 3: Run `make` from within `Build` (or equivalent)
3 If the compilation succeeds, try `./yap`. 4: If the compilation succeeds, try `./yap`. This is your executable.
4 If you feel satisfied with the result, do `make install`. 5: If you feel satisfied with the result, do `make install`.
* In most systems you will need to be superuser in order to do `make install` and `make info` on the standard directories.
5 In most systems you will need to be superuser in order to do
`make install` and `make info` on the standard directories.
Tuning the Functionality of YAP Tuning the Functionality of YAP
------------------------------- -------------------------------