Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions scripts/custom/install_xsd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ mkdir -p ${install_dir}
if version_lt "${version}" '4.2.0'; then
tar -xjf xsd-${version}-x86_64-linux-gnu.tar.bz2 -C ${install_dir} --strip-components=1
else
tar -xJf xsd-${version}-x86_64-linux-glibc2.31.tar.xz -C ${install_dir} --strip-components=1
tar -xJf xsd-${version}-x86_64-linux-glibc2.31.tar.xz -C ${install_dir} --strip-components=3
fi

Comment on lines +65 to 67
# Add modulefile
Expand All @@ -75,8 +75,7 @@ cat <<EOF > ${version}
##
proc ModulesTest { } {
set paths "[getenv XSD_ROOT]
[getenv XSD_ROOT]/bin
[getenv XSD_ROOT]/libxsd"
[getenv XSD_ROOT]/bin"

foreach path \$paths {
if { ![file exists \$path] } {
Expand All @@ -97,10 +96,6 @@ setenv XSD_ROOT ${install_dir}

prepend-path PATH ${install_dir}/bin

prepend-path INCLUDE ${install_dir}/libxsd
prepend-path C_INCLUDE_PATH ${install_dir}/libxsd
prepend-path CPLUS_INCLUDE_PATH ${install_dir}/libxsd

prepend-path CMAKE_PREFIX_PATH ${install_dir}

conflict xsd
Expand Down