Merge 192.168.1.79:github/yap-6.3

2018-03-26 11:03:08 +01:00
parent 9b86a7869b e02884a94f
commit 05356df347
119 changed files with 47950 additions and 1288 deletions
--- a/cmake/Prelims.cmake
+++ b/cmake/Prelims.cmake
@@ -0,0 +1,166 @@
+
+#begining stuff for top CMakeLists
+
+include (MacroLogFeature)
+
+if (POLICY CMP0042)
+    cmake_policy( SET CMP0042 NEW)
+endif()
+
+if (ANDROID)
+    macro ( MY_add_custom_target)
+    endmacro()
+else()
+    macro ( MY_add_custom_target )
+        add_custom_target (${ARGN})
+    endmacro()
+endif()
+
+
+if (ANDROID)
+    macro ( add_component arg1)
+        foreach(item ${ARGN})
+            get_filename_component(i ${item} ABSOLUTE)
+            set( ALL_SOURCES ${ALL_SOURCES} ${i} )
+        endforeach()
+        set( ALL_SOURCES ${ALL_SOURCES} PARENT_SCOPE )
+    endmacro()
+    macro ( add_external arg1)
+        foreach(item ${ARGN})
+            get_filename_component(i ${item} ABSOLUTE)
+            set( ALL_SOURCES ${ALL_SOURCES} ${i} )
+        endforeach()
+        set( ALL_SOURCES ${ALL_SOURCES} PARENT_SCOPE )
+    endmacro()
+else()
+    macro ( add_component arg1 )
+        add_library ( ${arg1} OBJECT ${ARGN})
+    endmacro()
+    macro ( add_external arg1 )
+        add_library ( ${arg1} SHARED ${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_add_dependencies)
+    endmacro()
+else()
+    macro ( MY_add_dependencies )
+        add_dependencies (${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_add_library)
+    endmacro()
+else()
+    macro ( MY_add_library )
+        add_library (${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_add_subdirectory)
+    endmacro()
+else()
+    macro ( MY_add_subdirectory )
+        add_subdirectory (${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_include)
+    endmacro()
+else()
+    macro ( MY_include )
+        include (${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_install)
+    endmacro()
+else()
+    macro ( MY_install )
+        install (${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_set_target_properties)
+    endmacro()
+else()
+    macro ( MY_set_target_properties )
+        set_target_properties (${ARGN})
+    endmacro()
+endif()
+
+if (ANDROID)
+    macro ( MY_target_link_libraries)
+    endmacro()
+else()
+    macro ( MY_target_link_libraries )
+        target_link_libraries (${ARGN})
+    endmacro()
+endif()
+
+
+# where we have most scripts
+# set path to additional CMake modules
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+include(disallow)
+
+disallow_intree_builds()
+
+# set(CMAKE_BUILD_TYPE  Debug)
+
+if (APPLE)
+    set (MACOSX_RPATH ON)
+endif (APPLE )
+if(POLICY CMP0042)
+    cmake_policy(SET CMP0042 NEW)
+endif(POLICY CMP0042)
+if(POLICY CMP0043)
+    cmake_policy(SET CMP0043 NEW)
+endif(POLICY CMP0043)
+
+
+if (ANDROID)
+    set ( prefix ${YAP_APP_DIR}/build )
+    set ( datarootdir ${prefix}/assets )
+else()
+set ( prefix "${CMAKE_INSTALL_PREFIX}")
+    set ( datarootdir ${prefix}/share )
+endif()
+    set ( libpl  ${datarootdir}/Yap)
+set ( includedir "${prefix}/include")
+set ( exec_prefix "${prefix}")
+set ( libdir "${exec_prefix}/lib")
+set ( datadir "${datarootdir}")
+set ( mandir "${datarootdir}/man")
+set ( bindir "${exec_prefix}/bin")
+set ( docdir "${datarootdir}/doc/Yap")
+set ( dlls "${exec_prefix}/lib/Yap")
+
+set(YAP_ROOTDIR ${prefix})
+
+# erootdir -> rootdir
+# bindir defined above
+# libdir defined above
+set(YAP_LIBDIR "${dlls}")
+set(YAP_SHAREDIR "${datarootdir}")
+set(YAP_BINDIR "${bindir}")
+set(YAP_INCLUDEDIR "${includedir}")
+set(YAP_ROOTDIR "${prefix}")
+
+#
+#
+# include( Sources NO_POLICY_SCOPE )
+#
+# include( Model NO_POLICY_SCOPE  )
+
+include (cudd NO-POLICY-SCOPE)
+include (python NO-POLICY-SCOPE)
+include (java NO-POLICY-SCOPE)