[hydra-commits] kpfleming: branch techdemo/kpfleming/slicing r564 - in /techdemo/team/kpflemi...

[SVN commits to the Hydra project]

Author: kpfleming
Date: Thu Apr  1 17:23:51 2010
New Revision: 564

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=564
Log:
get objects test building using CMake

Added:
    techdemo/team/kpfleming/slicing/CMakeLists.txt   (with props)
    techdemo/team/kpfleming/slicing/build/
    techdemo/team/kpfleming/slicing/objects/CMakeLists.txt   (with props)
    techdemo/team/kpfleming/slicing/objects/TestCommon.h   (with props)
Removed:
    techdemo/team/kpfleming/slicing/Makefile
Modified:
    techdemo/team/kpfleming/slicing/   (props changed)

Propchange: techdemo/team/kpfleming/slicing/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Apr  1 17:23:51 2010
@@ -1,0 +1,1 @@
+^/cmake/trunk		cmake

Added: techdemo/team/kpfleming/slicing/CMakeLists.txt
URL: https://origsvn.digium.com/svn-view/hydra/techdemo/team/kpfleming/slicing/CMakeLists.txt?view=auto&rev=564
==============================================================================
--- techdemo/team/kpfleming/slicing/CMakeLists.txt (added)
+++ techdemo/team/kpfleming/slicing/CMakeLists.txt Thu Apr  1 17:23:51 2010
@@ -1,0 +1,4 @@
+cmake_minimum_required(VERSION 2.6)
+include(cmake/Hydra_v3.cmake)
+hydra_project(slicing 3.4 CXX)
+add_subdirectory(objects)

Propchange: techdemo/team/kpfleming/slicing/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: techdemo/team/kpfleming/slicing/CMakeLists.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: techdemo/team/kpfleming/slicing/CMakeLists.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: techdemo/team/kpfleming/slicing/objects/CMakeLists.txt
URL: https://origsvn.digium.com/svn-view/hydra/techdemo/team/kpfleming/slicing/objects/CMakeLists.txt?view=auto&rev=564
==============================================================================
--- techdemo/team/kpfleming/slicing/objects/CMakeLists.txt (added)
+++ techdemo/team/kpfleming/slicing/objects/CMakeLists.txt Thu Apr  1 17:23:51 2010
@@ -1,0 +1,33 @@
+hydra_slice_include_directories(.)
+hydra_compile_slice(Test.ice)
+hydra_compile_slice(TestAMD.ice)
+hydra_compile_slice(ClientPrivate.ice)
+hydra_compile_slice(Forward.ice)
+hydra_compile_slice(ServerPrivate.ice)
+hydra_compile_slice(ServerPrivateAMD.ice)
+
+include_directories(.)
+
+hydra_component_init(client CXX)
+hydra_component_add_file(client Client.cpp)
+hydra_component_add_file(client AllTests.cpp)
+hydra_component_add_slice(client Test)
+hydra_component_add_slice(client Forward)
+hydra_component_add_slice(client ClientPrivate)
+hydra_component_build_standalone(client)
+
+hydra_component_init(server CXX)
+hydra_component_add_file(server Server.cpp)
+hydra_component_add_file(server TestI.cpp)
+hydra_component_add_slice(server Test)
+hydra_component_add_slice(server Forward)
+hydra_component_add_slice(server ServerPrivate)
+hydra_component_build_standalone(server)
+
+hydra_component_init(serveramd CXX)
+hydra_component_add_file(serveramd ServerAMD.cpp)
+hydra_component_add_file(serveramd TestAMDI.cpp)
+hydra_component_add_slice(serveramd TestAMD)
+hydra_component_add_slice(serveramd Forward)
+hydra_component_add_slice(serveramd ServerPrivateAMD)
+hydra_component_build_standalone(serveramd)

Propchange: techdemo/team/kpfleming/slicing/objects/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: techdemo/team/kpfleming/slicing/objects/CMakeLists.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: techdemo/team/kpfleming/slicing/objects/CMakeLists.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: techdemo/team/kpfleming/slicing/objects/TestCommon.h
URL: https://origsvn.digium.com/svn-view/hydra/techdemo/team/kpfleming/slicing/objects/TestCommon.h?view=auto&rev=564
==============================================================================
--- techdemo/team/kpfleming/slicing/objects/TestCommon.h (added)
+++ techdemo/team/kpfleming/slicing/objects/TestCommon.h Thu Apr  1 17:23:51 2010
@@ -1,0 +1,30 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef TEST_COMMON_H
+#define TEST_COMMON_H
+
+#include <IceUtil/Config.h>
+#include <cstdlib>
+
+#ifdef __BCPLUSPLUS__
+#include <stdlib.h>
+#endif
+
+void
+inline testFailed(const char* expr, const char* file, unsigned int line)
+{
+    std::cout << "failed!" << std::endl;
+    std::cout << file << ':' << line << ": assertion `" << expr << "' failed" << std::endl;
+    abort();
+}
+
+#define test(ex) ((ex) ? ((void)0) : testFailed(#ex, __FILE__, __LINE__))
+
+#endif

Propchange: techdemo/team/kpfleming/slicing/objects/TestCommon.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: techdemo/team/kpfleming/slicing/objects/TestCommon.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: techdemo/team/kpfleming/slicing/objects/TestCommon.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain