Commit 65c78cbe authored by David Partyka's avatar David Partyka
Browse files

Apply patch from sven to fix compile errors on Solaris.

parent a323e818
...@@ -126,12 +126,16 @@ IF(APPLE) ...@@ -126,12 +126,16 @@ IF(APPLE)
"-read_only_relocs suppress -Wl,-exported_symbols_list,${VTKOGGTHEORA_SOURCE_DIR}/vtkoggtheora.exp" "-read_only_relocs suppress -Wl,-exported_symbols_list,${VTKOGGTHEORA_SOURCE_DIR}/vtkoggtheora.exp"
) )
ENDIF(APPLE) ENDIF(APPLE)
# assume that -Wl,--version-script works on UNIX systems (excluding Mac and Cygwin). # assume that -Wl,--version-script works on UNIX systems (excluding Mac, Cygwin and Solaris SPARC).
# otherwise the user can always set to an empty string # otherwise the user can always set to an empty string
IF(UNIX AND NOT APPLE AND NOT CYGWIN) IF(UNIX AND NOT APPLE AND NOT CYGWIN)
SET( VTKOGGTHEORA_SHARED_LINKER_FLAGS IF("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
"-Wl,--version-script=${VTKOGGTHEORA_SOURCE_DIR}/vtkoggtheora.vscript" SET( VTKOGGTHEORA_SHARED_LINKER_FLAGS "" )
ELSE("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
SET( VTKOGGTHEORA_SHARED_LINKER_FLAGS
"-Wl,--version-script=${VTKOGGTHEORA_SOURCE_DIR}/vtkoggtheora.vscript"
) )
ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
ENDIF(UNIX AND NOT APPLE AND NOT CYGWIN) ENDIF(UNIX AND NOT APPLE AND NOT CYGWIN)
SET(VTKOGGTHEORA_SHARED_LINKER_FLAGS "${VTKOGGTHEORA_SHARED_LINKER_FLAGS}" SET(VTKOGGTHEORA_SHARED_LINKER_FLAGS "${VTKOGGTHEORA_SHARED_LINKER_FLAGS}"
CACHE STRING "Additional linker flags for vtkoggtheora when building as a shared library" CACHE STRING "Additional linker flags for vtkoggtheora when building as a shared library"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment