You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2012/05/16 11:35:36 UTC
svn commit: r1339086 - in /incubator/celix/trunk: .gitignore CMakeLists.txt
hessian/source/CMakeLists.txt hessian/source/public/include/hessian_2.0_out.h
Author: abroekhuis
Date: Wed May 16 09:35:36 2012
New Revision: 1339086
URL: http://svn.apache.org/viewvc?rev=1339086&view=rev
Log:
Build changes
Small changes to the hessian project
Modified:
incubator/celix/trunk/.gitignore
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/hessian/source/CMakeLists.txt
incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
Modified: incubator/celix/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.gitignore?rev=1339086&r1=1339085&r2=1339086&view=diff
==============================================================================
--- incubator/celix/trunk/.gitignore (original)
+++ incubator/celix/trunk/.gitignore Wed May 16 09:35:36 2012
@@ -1 +1,3 @@
/build
+
+hessian/build/
\ No newline at end of file
Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1339086&r1=1339085&r2=1339086&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Wed May 16 09:35:36 2012
@@ -63,5 +63,3 @@ add_subdirectory(deployment_admin)
include(target.cmake)
#enable_testing()
-
-add_subdirectory(hessian)
Modified: incubator/celix/trunk/hessian/source/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/CMakeLists.txt?rev=1339086&r1=1339085&r2=1339086&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/CMakeLists.txt (original)
+++ incubator/celix/trunk/hessian/source/CMakeLists.txt Wed May 16 09:35:36 2012
@@ -14,13 +14,70 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+cmake_minimum_required (VERSION 2.6)
+project (HessianC C)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cmake/modules/")
+
+SET(CMAKE_BUILD_TYPE "Debug")
+SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 ${CMAKE_C_FLAGS}")
+
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+ SET(DEFAULT_ARGS)
+ FOREACH(arg_name ${arg_names})
+ SET(${prefix}_${arg_name})
+ ENDFOREACH(arg_name)
+ FOREACH(option ${option_names})
+ SET(${prefix}_${option} FALSE)
+ ENDFOREACH(option)
+
+ SET(current_arg_name DEFAULT_ARGS)
+ SET(current_arg_list)
+ FOREACH(arg ${ARGN})
+ SET(larg_names ${arg_names})
+ LIST(FIND larg_names "${arg}" is_arg_name)
+ IF (is_arg_name GREATER -1)
+ SET(${prefix}_${current_arg_name} ${current_arg_list})
+ SET(current_arg_name ${arg})
+ SET(current_arg_list)
+ ELSE (is_arg_name GREATER -1)
+ SET(loption_names ${option_names})
+ LIST(FIND loption_names "${arg}" is_option)
+ IF (is_option GREATER -1)
+ SET(${prefix}_${arg} TRUE)
+ ELSE (is_option GREATER -1)
+ SET(current_arg_list ${current_arg_list} ${arg})
+ ENDIF (is_option GREATER -1)
+ ENDIF (is_arg_name GREATER -1)
+ ENDFOREACH(arg)
+ SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
+
+ADD_CUSTOM_TARGET(test)
+MACRO(run_test)
+ PARSE_ARGUMENTS(TEST "" "" ${ARGN})
+ LIST(GET TEST_DEFAULT_ARGS 0 EXEC)
+
+ SET(__testTarget test_${EXEC})
+
+ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test_results)
+
+ add_custom_target(${__testTarget}
+ ${EXEC} ${EXEC}
+ COMMAND xsltproc --path ${CUNIT_SHARE_DIR} ${CUNIT_SHARE_DIR}/CUnit-Run.xsl ${PROJECT_BINARY_DIR}/test_results/${EXEC}-Results.xml > ${EXEC}-Results.html
+ COMMAND xsltproc --path ${CUNIT_SHARE_DIR} ${CUNIT_SHARE_DIR}/CUnit-List.xsl ${PROJECT_BINARY_DIR}/test_results/${EXEC}-Listing.xml > ${EXEC}-Listing.html
+
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test_results
+ )
+ ADD_DEPENDENCIES(test ${__testTarget})
+ENDMACRO(run_test)
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("private/include")
include_directories("public/include")
add_library(hessian STATIC private/src/hessian_out private/src/hessian_in)
-target_link_libraries(hessian utils)
+
+include(FindCUnit)
include_directories(${CUNIT_INCLUDE_DIRS})
add_executable(test_hessian_out private/test/test_hessian_out.c)
Modified: incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h?rev=1339086&r1=1339085&r2=1339086&view=diff
==============================================================================
--- incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h (original)
+++ incubator/celix/trunk/hessian/source/public/include/hessian_2.0_out.h Wed May 16 09:35:36 2012
@@ -10,8 +10,8 @@
#include <stdbool.h>
-#include "linkedlist.h"
-#include "array_list.h"
+//#include "linkedlist.h"
+//#include "array_list.h"
#include "hessian_2.0.h"
typedef struct hessian * hessian_out_t;