From 247371c095f63184da15e8e8676caad2db143fb4 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 15 Dec 2014 23:05:05 +0000
Subject: [PATCH] cmake

---
 CMakeLists.txt           | 23 +++++++++++++----------
 os/libtai/CMakeLists.txt | 11 ++++++++---
 packages/raptor          |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aceb256ab..29bdb68ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ message(STATUS "Building YAP version ${YAP_VERSION}")
 
 # set path to additional CMake modules
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build)
 
 set(CMAKE_TOP_BINARY_DIR ${CMAKE_BINARY_DIR})
 set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl)
@@ -74,6 +73,8 @@ set(YAP_STARTUP startup.yss)
 string(TIMESTAMP YAP_TIMESTAMP)
 string( SUBSTRING ${CMAKE_SHARED_LIBRARY_SUFFIX} 1 -1 SO_EXT )
 #
+include_directories (H include os ${CMAKE_BINARY_DIR})
+
 # Optional libraries that affect compilation
 #
 include (ConfigureChecks)
@@ -337,13 +338,6 @@ set(CONSOLE_SOURCES console/yap.c)
 #   console/LGPL/pl-ntmain.c
 # )
 
-ADD_SUBDIRECTORY(library)
-ADD_SUBDIRECTORY(swi/library)
-# ADD_SUBDIRECTORY(os)
-# ADD_SUBDIRECTORY(packages)
-# ADD_SUBDIRECTORY(packages)
-ADD_SUBDIRECTORY(pl)
-
 ## define system
 
 add_library(libYap SHARED
@@ -370,8 +364,6 @@ option (WITH_Dynamic_BDD
 
 #TODO:
 
-include_directories (H include os ${CMAKE_CURRENT_BINARY_DIR})
-
 #
 # Arch checks
 #
@@ -470,8 +462,19 @@ cmake_dependent_option (WITH_PThreadLocking
   "use pthread locking primitives for internal locking" ON
   System_Threads OFF)
 
+ADD_SUBDIRECTORY(library)
+ADD_SUBDIRECTORY(swi/library)
+# ADD_SUBDIRECTORY(os)
+# ADD_SUBDIRECTORY(packages)
+# ADD_SUBDIRECTORY(packages)
+ADD_SUBDIRECTORY(pl)
+
 macro_optional_add_subdirectory (packages/cuda)  
 
+macro_optional_add_subdirectory (packages/real)  
+
+macro_optional_add_subdirectory (packages/python)  
+
 macro_optional_add_subdirectory (packages/raptor)  
 
 #macro_optional_add_subdirectory (packages/archive)
diff --git a/os/libtai/CMakeLists.txt b/os/libtai/CMakeLists.txt
index e4d27240f..825279912 100644
--- a/os/libtai/CMakeLists.txt
+++ b/os/libtai/CMakeLists.txt
@@ -37,12 +37,17 @@ set(LIBYAPTAI_SOURCES
   caltime_utc.c
   )
 
-add_library (libyaptai OBJECT
+# ugh
+set (POSITION_INDEPENDENT_CODE TRUE)
+
+add_library (libyaptai  OBJECT
   ${LIBYAPTAI_SOURCES})
 
 set_target_properties(libyaptai
-  PROPERTIES RPATH ${libdir} VERSION ${LIBYAPTAI_FULL_VERSION}
-  SOVERSION ${LIBYAPTAI_MAJOR_VERSION}.${LIBYAPTAI_MINOR_VERSION}
+  PROPERTIES
+  #  RPATH ${libdir} VERSION ${LIBYAPTAI_FULL_VERSION}
+  #  SOVERSION ${LIBYAPTAI_MAJOR_VERSION}.${LIBYAPTAI_MINOR_VERSION}
+  POSITION_INDEPENDENT_CODE TRUE
   OUTPUT_NAME yaptai
   )
 
diff --git a/packages/raptor b/packages/raptor
index c488f2493..27743988a 160000
--- a/packages/raptor
+++ b/packages/raptor
@@ -1 +1 @@
-Subproject commit c488f2493012e8e3b83bbcd4db020a3db5b96062
+Subproject commit 27743988a0004f68f9203784d2552ce16c91e23d