Mercurial > mxe-octave
annotate src/vtk-3-compile-tools.patch @ 4583:50ce0842665c
* src/graphicsmagick.mk: update version/checksum for v1.3.27
author | John D |
---|---|
date | Tue, 19 Dec 2017 13:13:25 -0500 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2064
diff
changeset
|
1 # This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 # See index.html for further information. |
2064
2ca0ca8f7a9f
package vtk: add patch headers
Mark Brand <mabrand@mabrand.nl>
parents:
2063
diff
changeset
|
3 |
2ca0ca8f7a9f
package vtk: add patch headers
Mark Brand <mabrand@mabrand.nl>
parents:
2063
diff
changeset
|
4 This patch has been taken from: |
2ca0ca8f7a9f
package vtk: add patch headers
Mark Brand <mabrand@mabrand.nl>
parents:
2063
diff
changeset
|
5 http://www.vtk.org/Bug/view.php?id=12686 |
2ca0ca8f7a9f
package vtk: add patch headers
Mark Brand <mabrand@mabrand.nl>
parents:
2063
diff
changeset
|
6 |
2062 | 7 --- VTK/Utilities/kwsys/CMakeLists.txt 2011-08-24 15:37:12.000000000 +0200 |
8 +++ VTK/Utilities/kwsys/CMakeLists.txt 2011-10-30 00:06:06.402085234 +0200 | |
9 @@ -937,13 +937,20 @@ | |
10 # file and build it into the library. Win9x platforms reproduce the | |
11 # executable into a temporary directory when it is needed. | |
12 IF(KWSYS_USE_Process) | |
13 - IF(NOT UNIX) | |
14 + IF(NOT CMAKE_CROSSCOMPILING) | |
15 # Build the forwarding executable itself and a program that will | |
16 # encode it into a C file. | |
17 - ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c) | |
18 ADD_EXECUTABLE(${KWSYS_NAMESPACE}EncodeExecutable EncodeExecutable.c) | |
19 - KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE}) | |
20 KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}EncodeExecutable PROPERTY LABELS ${KWSYS_LABELS_EXE}) | |
21 + EXPORT(TARGETS ${KWSYS_NAMESPACE}EncodeExecutable FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) | |
22 + IF(COMPILE_TOOLS_TARGET) | |
23 + ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} ${KWSYS_NAMESPACE}EncodeExecutable) | |
24 + ENDIF(COMPILE_TOOLS_TARGET) | |
25 + ENDIF(NOT CMAKE_CROSSCOMPILING) | |
26 + | |
27 + IF(NOT UNIX) | |
28 + ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c) | |
29 + KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE}) | |
30 | |
31 # Construct the location of the executable to be encoded. | |
32 SET(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}) | |
33 @@ -957,24 +964,23 @@ | |
34 ENDIF(CMAKE_BUILD_TOOL MATCHES "make") | |
35 | |
36 # Take advantage of a better custom command syntax if possible. | |
37 - SET(CMD ${BIN_DIR}${CFG_INTDIR}/${KWSYS_NAMESPACE}EncodeExecutable.exe) | |
38 SET(FWD ${BIN_DIR}${CFG_INTDIR}/${KWSYS_NAMESPACE}ProcessFwd9x.exe) | |
39 IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6) | |
40 ADD_CUSTOM_COMMAND( | |
41 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c | |
42 - COMMAND ${CMD} | |
43 + COMMAND ${KWSYS_NAMESPACE}EncodeExecutable | |
44 ARGS ${FWD} ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c | |
45 ${KWSYS_NAMESPACE} ProcessFwd9x | |
46 - DEPENDS ${CMD} ${FWD}) | |
47 + DEPENDS ${KWSYS_NAMESPACE}EncodeExecutable ${FWD}) | |
48 ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6) | |
49 ADD_CUSTOM_COMMAND( | |
50 TARGET ${KWSYS_NAMESPACE} | |
51 SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ProcessFwd9x.c | |
52 - COMMAND ${CMD} | |
53 + COMMAND ${KWSYS_NAMESPACE}EncodeExecutable | |
54 ARGS ${FWD} ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c | |
55 ${KWSYS_NAMESPACE} ProcessFwd9x | |
56 OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c | |
57 - DEPENDS ${CMD} ${FWD}) | |
58 + DEPENDS ${KWSYS_NAMESPACE}EncodeExecutable ${FWD}) | |
59 ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6) | |
60 | |
61 # Make sure build occurs in proper order. | |
2063
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
62 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
63 --- VTK/Utilities/vtkhdf5/src/CMakeLists.txt 2011-08-24 15:37:13.000000000 +0200 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
64 +++ VTK/Utilities/vtkhdf5/src/CMakeLists.txt 2011-10-30 00:13:16.798098058 +0200 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
65 @@ -572,34 +572,40 @@ |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
66 # Setup the H5Detect utility which generates H5Tinit with platform |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
67 # specific type checks inside |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
68 #----------------------------------------------------------------------------- |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
69 -SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5detect${EXE_EXT}) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
70 -IF (XCODE) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
71 - SET (CMD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5detect") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
72 -ENDIF (XCODE) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
73 -ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
74 -IF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
75 - TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
76 -ENDIF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
77 +IF(NOT CMAKE_CROSSCOMPILING) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
78 + ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
79 + IF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
80 + TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
81 + ENDIF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
82 + |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
83 + EXPORT(TARGETS H5detect FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
84 + IF(COMPILE_TOOLS_TARGET) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
85 + ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} H5detect) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
86 + ENDIF(COMPILE_TOOLS_TARGET) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
87 +ENDIF(NOT CMAKE_CROSSCOMPILING) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
88 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
89 ADD_CUSTOM_COMMAND ( |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
90 OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
91 - COMMAND ${CMD} |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
92 + COMMAND H5detect |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
93 ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
94 DEPENDS H5detect |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
95 ) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
96 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
97 -SET (CMDL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5make_libsettings${EXE_EXT}) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
98 -IF (XCODE) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
99 - SET (CMDL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5make_libsettings") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
100 -ENDIF (XCODE) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
101 -ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
102 -IF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
103 - TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
104 -ENDIF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
105 +IF(NOT CMAKE_CROSSCOMPILING) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
106 + ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
107 + IF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
108 + TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
109 + ENDIF (WIN32) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
110 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
111 + EXPORT(TARGETS H5make_libsettings FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
112 + IF(COMPILE_TOOLS_TARGET) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
113 + ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} H5make_libsettings) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
114 + ENDIF(COMPILE_TOOLS_TARGET) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
115 +ENDIF(NOT CMAKE_CROSSCOMPILING) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
116 + |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
117 ADD_CUSTOM_COMMAND ( |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
118 OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
119 - COMMAND ${CMDL} |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
120 + COMMAND H5make_libsettings |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
121 ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
122 DEPENDS H5make_libsettings |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
123 ) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
124 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
125 --- VTK/CMakeLists.txt 2011-08-24 15:37:07.000000000 +0200 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
126 +++ VTK/CMakeLists.txt 2011-10-31 09:12:59.451958504 +0100 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
127 @@ -42,8 +42,13 @@ |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
128 FILE(WRITE "${EXPORT_EXECUTABLES_FILE}" "#generated by VTK, do not edit\n") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
129 ENDIF(NOT EXPORT_EXECUTABLES_FILE) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
130 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
131 +# Add a target for building only the compile tools |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
132 +ADD_CUSTOM_TARGET(CompileTools) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
133 +SET(COMPILE_TOOLS_TARGET "CompileTools") |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
134 + |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
135 GET_PROPERTY(VTK_TARGET_SUPPORTS_SHARED_LIBS |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
136 GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS) |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
137 + |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
138 |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
139 # Warn when using "old style" CMake install commands... But only when |
3623b7b968d0
package vtk: consolidate patch file and add tools target
Muellni <mmuellen@gmx.de>
parents:
2062
diff
changeset
|
140 # building VTK itself. |