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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Wed Jun 1 17:14:27 CDT 2011


branch "master" has been updated
       via  bb3701dc70706e14e7def66d8560f47b96eeacef (commit)
      from  1d64744c3d255ffae0447d3c157e2bda220eb560 (commit)

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


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

    More CMake script cleanup.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b137cfc..bc9bdf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 asterisk_scf_project(Logger 3.4)
 
 add_subdirectory(server)
-add_subdirectory(client) # For the client test directory.
+add_subdirectory(client)
 
 # The client component is built here, so as to be able to add files
 # from both src and include directories.
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index b70278a..2c45ea8 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -22,6 +22,4 @@ asterisk_scf_component_add_boost_libraries(LoggingConfigurationTest unit_test_fr
 asterisk_scf_component_build_icebox(LoggingConfigurationTest)
 target_link_libraries(LoggingConfigurationTest asterisk-scf-api)
 
-if(integrated_build STREQUAL "true")
-  asterisk_scf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
-endif()
+asterisk_scf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)

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


-- 
asterisk-scf/release/logger.git



More information about the asterisk-scf-commits mailing list