blob: efb234e508963be65a9415af158f9706b3761956 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff --git a/src/xalanc/Include/XalanVersion.hpp.in b/src/xalanc/Include/XalanVersion.hpp.in
index d0a7d971..63911ede 100644
--- a/src/xalanc/Include/XalanVersion.hpp.in
+++ b/src/xalanc/Include/XalanVersion.hpp.in
@@ -26,11 +26,11 @@
#define XALANVERSION_HEADER_GUARD_1357924680
/// Xalan-C major version.
-#define XALAN_VERSION_MAJOR (@xalan-c_VERSION_MAJOR@)
+#define XALAN_VERSION_MAJOR @xalan-c_VERSION_MAJOR@
/// Xalan-C minor version.
-#define XALAN_VERSION_MINOR (@xalan-c_VERSION_MINOR@)
+#define XALAN_VERSION_MINOR @xalan-c_VERSION_MINOR@
/// Xalan-C patch version.
-#define XALAN_VERSION_REVISION (@xalan-c_VERSION_PATCH@)
+#define XALAN_VERSION_REVISION @xalan-c_VERSION_PATCH@
/**
* Xalan-C++ version represented as a single integer value.
diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt
index dc39ad0c..78b61601 100644
--- a/src/xalanc/Utils/CMakeLists.txt
+++ b/src/xalanc/Utils/CMakeLists.txt
@@ -41,13 +41,22 @@ add_custom_target(locale ALL)
set_target_properties(locale PROPERTIES FOLDER "Message Library")
if(msgloader STREQUAL "inmemory")
+ set(MsgCreatorCommandFilename "${XLIFF_FILE_NAME}")
+ set(MsgCreatorCommand "$<TARGET_FILE:MsgCreator>" -TYPE inmem -LOCALE ${LOCALE})
+
+ if(CMAKE_CROSSCOMPILING_EMULATOR)
+ set(MsgCreatorCommand "${CMAKE_CROSSCOMPILING_EMULATOR}" "${MsgCreatorCommand}")
+ if(WIN32)
+ set(MsgCreatorCommandFilename "Z:${MsgCreatorCommandFilename}")
+ endif()
+ endif()
+
+ set(MsgCreatorCommand "${MsgCreatorCommand}" "${MsgCreatorCommandFilename}")
+
add_custom_command(
OUTPUT "${GENMSGINDEX}"
"${GENMSGDATA}"
- COMMAND "$<TARGET_FILE:MsgCreator>"
- "${XLIFF_FILE_NAME}"
- -TYPE inmem
- -LOCALE ${LOCALE}
+ COMMAND ${MsgCreatorCommand}
WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
COMMENT "Generating inmemory locale message data"
DEPENDS MsgCreator "${XLIFF_FILE_NAME}")
|