[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  2dc34886a7215947c02bef873e46c6acc3f79f25 (commit)
      from  f85f58b9b98c2fb2246fff3e68bdd8c8defe140f (commit)

Summary of changes:
 src/CMakeLists.txt  |    5 +----
 test/CMakeLists.txt |    7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 2dc34886a7215947c02bef873e46c6acc3f79f25
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jun 1 16:57:46 2011 -0500

    More CMake script cleanup.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c1804cf..859c2e9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,5 @@
-include_directories(${utils_dir}/include)
 include_directories(${API_INCLUDE_DIR})
-if(NOT logger_dir)
-  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
+include_directories(${ice-util-cpp_dir}/include)
 include_directories(${logger_dir}/include)
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 87662d4..bc8266a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,8 +18,5 @@ pjproject_link(media_rtp_pjmedia_test_v6 pjlib)
 set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
 target_link_libraries(media_rtp_pjmedia_test_v6 asterisk-scf-api)
 
-# integration test
-if(integrated_build STREQUAL "true")
-  asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
-  asterisk_scf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
-endif()
+asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
+asterisk_scf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)

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


-- 
asterisk-scf/release/media_rtp_pjmedia.git