[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jun 23 13:25:13 CDT 2011


branch "master" has been updated
       via  61a9e819013d5861e6095f8668999645a563f599 (commit)
      from  56b528b14638e626592bbe740f1086e96bfe6aef (commit)

Summary of changes:
 test/CMakeLists.txt             |    2 +-
 test/Replication/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 61a9e819013d5861e6095f8668999645a563f599
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jun 23 13:24:46 2011 -0500

    Provide a real path to astscf_slice_collection().
    
    There is at least one version of CMake that has a different 'current directory'
    when astscf_slice_collection() is executed than these scripts expect... so
    instead, pass a complete path to that function so the current directory won't
    matter.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ef44216..160f2f7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 astscf_component_init(astscf-ice-util-cpp-test)
-astscf_slice_collection(LOCAL PATH .)
+astscf_slice_collection(LOCAL PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 astscf_component_add_slices(astscf-ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
 astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
 astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 62758f2..7e6583d 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,5 +1,5 @@
 astscf_component_init(StateReplicatorTest)
-astscf_slice_collection(LOCAL PATH slice)
+astscf_slice_collection(LOCAL PATH "${CMAKE_CURRENT_SOURCE_DIR}/slice")
 astscf_component_add_files(StateReplicatorTest TestStateReplicator.cpp)
 astscf_component_add_files(StateReplicatorTest SharedTestData.h)
 astscf_component_add_files(StateReplicatorTest MockStateReplicatorListener.h)

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


-- 
asterisk-scf/release/ice-util-cpp.git



More information about the asterisk-scf-commits mailing list