Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
VTK
VTK
Commits
09f0204d
Commit
09f0204d
authored
Dec 02, 2014
by
Dan Lipsa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove lib prefix from windows libraries and mangle additional symbols.
Change-Id: Ide31a5e04263d237529208f7b3d4eb5645a583ab
parent
1d320105
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
28 deletions
+7
-28
ThirdParty/hdf5/vtkhdf5/config/cmake/HDFMacros.cmake
ThirdParty/hdf5/vtkhdf5/config/cmake/HDFMacros.cmake
+3
-23
ThirdParty/hdf5/vtkhdf5/src/vtk_libhdf5_mangle.h
ThirdParty/hdf5/vtkhdf5/src/vtk_libhdf5_mangle.h
+4
-5
No files found.
ThirdParty/hdf5/vtkhdf5/config/cmake/HDFMacros.cmake
View file @
09f0204d
...
@@ -77,29 +77,9 @@ ENDMACRO (INSTALL_PROGRAM_PDB)
...
@@ -77,29 +77,9 @@ ENDMACRO (INSTALL_PROGRAM_PDB)
MACRO
(
HDF_SET_LIB_OPTIONS libtarget _libname libtype
)
MACRO
(
HDF_SET_LIB_OPTIONS libtarget _libname libtype
)
set
(
libname
"
${
_libname
}${
VTK_CUSTOM_LIBRARY_SUFFIX
}
"
)
set
(
libname
"
${
_libname
}${
VTK_CUSTOM_LIBRARY_SUFFIX
}
"
)
# message (STATUS "${libname} libtype: ${libtype}")
# message (STATUS "${libname} libtype: ${libtype}")
if
(
${
libtype
}
MATCHES
"SHARED"
)
# We don't mangle library names based on build type or platform.
if
(
WIN32
)
set
(
LIB_RELEASE_NAME
"
${
libname
}
"
)
set
(
LIB_RELEASE_NAME
"
${
libname
}
"
)
set
(
LIB_DEBUG_NAME
"
${
libname
}
"
)
set
(
LIB_DEBUG_NAME
"
${
libname
}
"
)
else
(
WIN32
)
set
(
LIB_RELEASE_NAME
"
${
libname
}
"
)
set
(
LIB_DEBUG_NAME
"
${
libname
}
"
)
endif
(
WIN32
)
else
(
${
libtype
}
MATCHES
"SHARED"
)
if
(
WIN32
)
set
(
LIB_RELEASE_NAME
"lib
${
libname
}
"
)
set
(
LIB_DEBUG_NAME
"lib
${
libname
}
"
)
else
(
WIN32
)
# if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
if
(
CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE
)
set
(
LIB_RELEASE_NAME
"
${
libname
}
"
)
set
(
LIB_DEBUG_NAME
"
${
libname
}
"
)
else
(
CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE
)
set
(
LIB_RELEASE_NAME
"lib
${
libname
}
"
)
set
(
LIB_DEBUG_NAME
"lib
${
libname
}
"
)
endif
(
CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE
)
endif
(
WIN32
)
endif
(
${
libtype
}
MATCHES
"SHARED"
)
set_target_properties
(
${
libtarget
}
set_target_properties
(
${
libtarget
}
PROPERTIES
PROPERTIES
...
...
ThirdParty/hdf5/vtkhdf5/src/vtk_libhdf5_mangle.h
View file @
09f0204d
...
@@ -10,11 +10,7 @@ VTK.
...
@@ -10,11 +10,7 @@ VTK.
The following command was used to obtain the symbol list:
The following command was used to obtain the symbol list:
nm libhdf5_debug.dylib | grep " [TR] " | awk '{print "#define "$3" vtk_"$3}'
nm libhdf5.so | grep " [ABCDGNRSTVW] " | awk '{print "#define "$3" vtk__"$3}' > ~/src/VTK/ThirdParty/hdf5/vtkhdf5/src/vtk_libhdf5_mangle.h
Then on Linux I did the following to add symbols:
nm libhdf5.so | grep " [ABCDGNRSTVW] " | awk '{print "#define "$3" vtk__"$3}' >> ~/src/VTK/ThirdParty/hdf5/vtkhdf5/src/vtk_libhdf5_mangle.h
*/
*/
...
@@ -2465,6 +2461,9 @@ nm libhdf5.so | grep " [ABCDGNRSTVW] " | awk '{print "#define "$3" vtk__"$3}' >>
...
@@ -2465,6 +2461,9 @@ nm libhdf5.so | grep " [ABCDGNRSTVW] " | awk '{print "#define "$3" vtk__"$3}' >>
#define HDrand vtk__HDrand
#define HDrand vtk__HDrand
#define HDsrand vtk__HDsrand
#define HDsrand vtk__HDsrand
#define HDstrtoll vtk__HDstrtoll
#define HDstrtoll vtk__HDstrtoll
#define H5MM_calloc vtk__H5MM_calloc
#define H5MM_malloc vtk__H5MM_malloc
#if !defined(_fini) && !defined(_init)
#if !defined(_fini) && !defined(_init)
#define _fini vtk___fini
#define _fini vtk___fini
#define _init vtk___init
#define _init vtk___init
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment