[hydra-commits] hydra/slice.git branch "master" updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  f3aca48e2fae75fe6944aab2a7350008f887be54 (commit)
      from  635497eac50a3a715f65618102876c6fdcd052cd (commit)

Summary of changes:
 CMakeLists.txt  |    3 +++
 media/media.ice |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit f3aca48e2fae75fe6944aab2a7350008f887be54
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Aug 5 17:50:20 2010 -0300

    Change how we can include our own slice definitions based on feedback from kpfleming.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e646485..602cc69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Make all of our slice definitions available to... themselves!
+hydra_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIRECTORY})
+
 # Slice definitions for core functionality
 add_subdirectory(core)
 
diff --git a/media/media.ice b/media/media.ice
index daec9a0..4b1ce43 100644
--- a/media/media.ice
+++ b/media/media.ice
@@ -1,5 +1,5 @@
 #include <Ice/BuiltinSequences.ice>
-#include "../core/service_locator.ice"
+#include "core/service_locator.ice"
 
 module Hydra
 {

-----------------------------------------------------------------------


-- 
hydra/slice.git