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

Merge https://github.com/vscosta/yap-6.3

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-01-09 20:28:28 +00:00
commit 53039d3785
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -13,14 +13,13 @@ if (ANDROID)
else () else ()
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
include(CMakeToolsHelpers OPTIONAL) include(CMakeToolsHelpers OPTIONAL)
endif() endif()
set( set(
CMAKE_MODULE_PATH CMAKE_MODULE_PATH
"${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/cmake") "${CMAKE_SOURCE_DIR}/cmake"
)
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckLibraryExists) include(CheckLibraryExists)
@ -54,8 +53,6 @@ endif()
option(BUILD_SHARED_LIBS "Build shared library" ON) option(BUILD_SHARED_LIBS "Build shared library" ON)
set (CMAKE_POSITION_INDEPENDENT_CODE TRUE) set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
include(Prelims NO_POLICY_SCOPE) include(Prelims NO_POLICY_SCOPE)
include(Sources NO_POLICY_SCOPE) include(Sources NO_POLICY_SCOPE)
@ -85,7 +82,8 @@ if (MYSQL_POSTGRES)
add_definitions(= -DMYDDAS_POSTGRES=1) add_definitions(= -DMYDDAS_POSTGRES=1)
endif() endif()
if (ANDROID)
if (ANDROID)
ADD_SUBDIRECTORY(os) ADD_SUBDIRECTORY(os)
ADD_SUBDIRECTORY(OPTYap) ADD_SUBDIRECTORY(OPTYap)
@ -114,15 +112,18 @@ if (WIN32)
list (APPEND YLIBS $<TARGET_OBJECTS:YapC++>) list (APPEND YLIBS $<TARGET_OBJECTS:YapC++>)
endif() endif()
<<<<<<< HEAD
=======
>>>>>>> 6aaa32363c7e98297e48a79ea03ae55de59fbdb3
add_component (core add_component (core
${ENGINE_SOURCES} ${ENGINE_SOURCES}
${SWIG_FILES} ${SWIG_FILES}
${C_INTERFACE_SOURCES} ${C_INTERFACE_SOURCES}
${STATIC_SOURCES} ${STATIC_SOURCES}
${ALL_SOURCES} ${ALL_SOURCES}
) )
add_library( # Sets the name of the library. add_library( # Sets the name of the library.

4
packages/gecode/gecode4-common.icc
View File

@ -82,7 +82,7 @@ namespace generic_gecode
struct GenericRestartDFS: GenericEngine struct GenericRestartDFS: GenericEngine
{ {
RBS<GenericSpace,DFS> engine; RBS<DFS,GenericSpace> engine;
GenericRestartDFS(GenericSpace* s,Search::Options& opt) : engine(s,opt) {} GenericRestartDFS(GenericSpace* s,Search::Options& opt) : engine(s,opt) {}
virtual GenericSpace* next(void) { return engine.next(); } virtual GenericSpace* next(void) { return engine.next(); }
}; };
@ -96,7 +96,7 @@ namespace generic_gecode
struct GenericRestartBAB: GenericEngine struct GenericRestartBAB: GenericEngine
{ {
RBS<GenericSpace,BAB> engine; RBS<BAB,GenericSpace> engine;
GenericRestartBAB(GenericSpace* s,Search::Options& opt) : engine(s,opt) {} GenericRestartBAB(GenericSpace* s,Search::Options& opt) : engine(s,opt) {}
virtual GenericSpace* next(void) { return engine.next(); } virtual GenericSpace* next(void) { return engine.next(); }
}; };