[hydra-commits] file: branch techdemo/kpfleming/multi-version-server r582 - /techdemo/team/kp...

[SVN commits to the Hydra project]

Author: file
Date: Tue Apr 13 15:37:08 2010
New Revision: 582

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=582
Log:
Update to latest Hydra cmake script.

Modified:
    techdemo/team/kpfleming/multi-version-server/CMakeLists.txt

Modified: techdemo/team/kpfleming/multi-version-server/CMakeLists.txt
URL: https://origsvn.digium.com/svn-view/hydra/techdemo/team/kpfleming/multi-version-server/CMakeLists.txt?view=diff&rev=582&r1=581&r2=582
==============================================================================
--- techdemo/team/kpfleming/multi-version-server/CMakeLists.txt (original)
+++ techdemo/team/kpfleming/multi-version-server/CMakeLists.txt Tue Apr 13 15:37:08 2010
@@ -11,32 +11,32 @@
 #
 # include(cmake/Hydra.cmake)
 #
-include(cmake/Hydra.cmake)
+include(cmake/Hydra_v3.cmake)
 
 set(CMAKE_CXX_FLAGS "-g3 -Wall")
 
 # Note that the only valid languages for the following functions are: CXX (for C++)
 
 # This function takes a project name as an argument and sets the project up in CMake.
-hydra_project(multi-version-server)
+hydra_project(multi-version-server 3.4 CXX)
 
 hydra_component_init(cpp_client_v1 CXX)
 hydra_component_init(cpp_client_v2 CXX)
 hydra_component_init(cpp_server CXX)
 
-hydra_component_add_slice(cpp_client_v1 sip_endpoint_v1_client.ice)
-hydra_component_add_slice(cpp_client_v2 sip_endpoint.ice)
-hydra_component_add_slice(cpp_server sip_endpoint_v1_server.ice)
-hydra_component_add_slice(cpp_server sip_endpoint.ice)
+hydra_compile_slice(sip_endpoint_v1_client.ice)
+hydra_compile_slice(sip_endpoint.ice)
+hydra_compile_slice(sip_endpoint_v1_server.ice)
+
+hydra_component_add_slice(cpp_client_v1 sip_endpoint_v1_client)
+hydra_component_add_slice(cpp_client_v2 sip_endpoint)
+hydra_component_add_slice(cpp_server sip_endpoint_v1_server)
+hydra_component_add_slice(cpp_server sip_endpoint)
 
 hydra_component_add_file(cpp_client_v1 cpp_client_v1.cpp)
 hydra_component_add_file(cpp_client_v2 cpp_client_v2.cpp)
 hydra_component_add_file(cpp_server cpp_server.cpp)
 
-hydra_component_build_prep(cpp_client_v1)
-hydra_component_build_prep(cpp_client_v2)
-hydra_component_build_prep(cpp_server)
-
 hydra_component_build_icebox(cpp_client_v1)
 hydra_component_build_icebox(cpp_client_v2)
 hydra_component_build_icebox(cpp_server)