Revision 9f38e25a
b/python/CMakeLists.txt | ||
---|---|---|
50 | 50 |
set(H2XML_FLAGS "-c") |
51 | 51 |
set(H2XML_DEPS "") |
52 | 52 |
set(H2XML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../src/include") |
53 |
set(H2XML_INCLUDE_DIR2 "${CMAKE_CURRENT_BINARY_DIR}/../src/include") |
|
53 | 54 |
|
54 | 55 |
set(H2XML_OUTPUT_XSEG "${CMAKE_CURRENT_BINARY_DIR}/xseg.xml") |
55 | 56 |
set(H2XML_INPUT_XSEG "${CMAKE_CURRENT_SOURCE_DIR}/../src/include/xseg/xseg.h") |
... | ... | |
89 | 90 |
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/xseg |
90 | 91 |
COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/xseg/__init__.py |
91 | 92 |
|
92 |
COMMAND ${H2XML} ${H2XML_FLAGS} -I ${H2XML_INCLUDE_DIR} -o ${H2XML_OUTPUT_XSEG} ${H2XML_INPUT_XSEG}
|
|
93 |
COMMAND ${H2XML} ${H2XML_FLAGS} -I ${H2XML_INCLUDE_DIR} -I ${H2XML_INCLUDE_DIR2} -o ${H2XML_OUTPUT_XSEG} ${H2XML_INPUT_XSEG}
|
|
93 | 94 |
COMMAND ${ENV} ${XML2PY_ENV} ${XML2PY} ${H2XML_OUTPUT_XSEG} -d -k defst -c -l ${XSEG_LIB} -o ${XML2PY_OUTPUT_XSEG} |
94 | 95 |
COMMAND ${SED1} |
95 | 96 |
COMMAND ${SED2} |
96 | 97 |
COMMAND ${SED3} |
97 | 98 |
|
98 |
COMMAND ${H2XML} ${H2XML_FLAGS} -I ${H2XML_INCLUDE_DIR} -o ${H2XML_OUTPUT_PROTOCOL} ${H2XML_INPUT_PROTOCOL}
|
|
99 |
COMMAND ${H2XML} ${H2XML_FLAGS} -I ${H2XML_INCLUDE_DIR} -I ${H2XML_INCLUDE_DIR2} -o ${H2XML_OUTPUT_PROTOCOL} ${H2XML_INPUT_PROTOCOL}
|
|
99 | 100 |
COMMAND ${ENV} ${XML2PY_ENV} ${XML2PY} |
100 | 101 |
${H2XML_OUTPUT_PROTOCOL} -d -k defst -c -l ${XSEG_LIB} -o ${XML2PY_OUTPUT_PROTOCOL} |
101 | 102 |
|
b/src/CMakeLists.txt | ||
---|---|---|
69 | 69 |
#add_subdirectory(exports) |
70 | 70 |
|
71 | 71 |
|
72 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/xseg/version.h.in |
|
73 |
${CMAKE_CURRENT_BINARY_DIR}/include/xseg/version.h) |
|
74 |
|
|
72 | 75 |
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) |
76 |
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) |
|
73 | 77 |
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) |
74 | 78 |
set(xseg_srcs xseg.c initialize.c xseg_posix.c xseg_pthread.c xseg_posixfd.c |
75 | 79 |
xseg_user.c xtypes/xcache.c xtypes/xbinheap.c xtypes/xhash.c |
... | ... | |
98 | 102 |
INSTALL_TARGETS(/lib xseg) |
99 | 103 |
INSTALL_TARGETS(/bin xseg-tool) |
100 | 104 |
#INSTALL_FILES(/include ) |
101 |
INSTALL(DIRECTORY include DESTINATION /usr) |
|
105 |
INSTALL(DIRECTORY include DESTINATION /usr FILES_MATCHING PATTERN "*.h") |
|
106 |
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include DESTINATION /usr) |
|
102 | 107 |
#install(FILES libxseg0.so DESTINATION $DESTDIR/usr/lib/) |
103 | 108 |
#install(FILES libxseg0.so.${MAJOR} DESTINATION $DESTDIR/usr/lib/) |
104 | 109 |
#install(FILES libxseg0.so.${MAJOR}.${MINOR} DESTINATION $DESTDIR/usr/lib/) |
b/src/include/xseg/version.h.in | ||
---|---|---|
1 |
#ifndef XSEG_VERSION_H |
|
2 |
|
|
3 |
#define XSEG_VERSION_H |
|
4 |
|
|
5 |
#define XSEG_MAJOR ((uint64_t)${MAJOR}) |
|
6 |
#define XSEG_MINOR ((uint64_t)${MINOR}) |
|
7 |
|
|
8 |
#define XSEG_VERSION ((uint64_t)((XSEG_MAJOR << 48) + (XSEG_MINOR << 16)) + 0) |
|
9 |
|
|
10 |
#endif /* XSEG_VERSION_H */ |
b/src/include/xseg/xseg.h | ||
---|---|---|
35 | 35 |
#ifndef _XSEG_H |
36 | 36 |
#define _XSEG_H |
37 | 37 |
|
38 |
#ifndef XSEG_VERSION |
|
39 |
#define XSEG_VERSION 2012022601 |
|
40 |
#endif |
|
41 |
|
|
42 | 38 |
#ifndef XSEG_PAGE_SHIFT |
43 | 39 |
#define XSEG_PAGE_SHIFT 12 |
44 | 40 |
#endif |
... | ... | |
53 | 49 |
|
54 | 50 |
#include <stdint.h> |
55 | 51 |
#include <sys/time.h> |
52 |
#include <xseg/version.h> |
|
56 | 53 |
#include <xseg/util.h> |
57 | 54 |
#include <xseg/xq.h> |
58 | 55 |
#include <xseg/xobj.h> |
b/tests/CMakeLists.txt | ||
---|---|---|
36 | 36 |
project (xseg_tests) |
37 | 37 |
|
38 | 38 |
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/include) |
39 |
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src/include) |
|
39 | 40 |
|
40 | 41 |
add_executable(xbinheap_test xbinheap_test.c) |
41 | 42 |
target_link_libraries(xbinheap_test xseg) |
Also available in: Unified diff