Switch main build to Qt6

Also deactivate smvtool++ as svm_light is no more available currently.

.github/workflows/build-win.yml

@@ -0,0 +1,63 @@
+on:
+  push:
+    branches:
+    - master
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  MANYLINUX_TAG: "2022-10-25-fbea779"
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+  PYTHON_VERSION: "3.7"
+  PYTHON_SHORT_VERSION: "cp37-cp37m"
+  PYTHON_WHEEL_VERSION: "cp37-abi3"
+  PYTHON_FULL_VERSION: "3.7.13"
+  QT_VERSION_MAJOR: "5"
+  QT_VERSION_MINOR: "15"
+  QT_VERSION_PATCH: "2"
+  QT_VERSION: "5.15"
+  QT_FULL_VERSION: "5.15.2"
+  PYSIDE_VERSION: "2"
+  LLVM_VERSION: "14.0.6"
+  GCC_VERSION: "10.1.0"
+
+
+jobs:
+samples-build-VS-2019:
+runs-on: windows-2019
+
+strategy:
+  matrix:
+    configuration: [Release]
+    platform: [x64]
+
+steps:
+  - name: "Checkout code"
+    uses: actions/checkout@v3
+    with:
+        submodules: recursive
+
+  - name: Installing vcpkg (windows)
+    run: |
+      cd ..
+      git clone https://github.com/Microsoft/vcpkg.git
+      cd vcpkg
+      git checkout --force 2020.01
+      .\bootstrap-vcpkg.bat
+      .\vcpkg.exe install cppzmq:x64-windows
+
+  - name: Running cmake (windows)
+    run: |
+      cd ${{ github.workspace }}
+      ls
+      mkdir build
+      cd build
+      cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}
+                /../vcpkg/scripts/buildsystems/vcpkg.cmake
+
+  - name: Build Solution (windows)
+    run: |
+      cd build
+      MSBuild.exe CMakeHelloWorld.sln
+

.github/workflows/build.yml

@@ -12,7 +12,7 @@ env:
   # PYTHON_VERSION: "3.7"
   # PYTHON_SHORT_VERSION: "cp37-cp37m"
   # PYTHON_FULL_VERSION: "3.7.13"
-  # QT_VERSION_MAJOR: "5"
+  QT_VERSION_MAJOR: "6"
   # QT_VERSION_MINOR: "15"
   # QT_VERSION_PATCH: "2"
   # QT_VERSION: "5.15"
@@ -25,7 +25,7 @@ env:
 jobs:
 
   debian11:
-    name: "Build on Debian 11 with TensorFlow support"
+    name: "Build on Debian 12 with TensorFlow support"
     runs-on: ubuntu-latest
 #    container: docker:20.10.13-dind
 
@@ -79,7 +79,7 @@ jobs:
         uses: docker/[email protected]
         with:
           context: .
-          file: "continuous_integration/Dockerfile-debian11"
+          file: "continuous_integration/Dockerfile-debian12"
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -100,53 +100,6 @@ jobs:
       #   # against the sigstore community Fulcio instance.
       #   run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
 
-  # Cannot run this build on each commit to master, it takes to much time (several hours), having to build the
-  # whole qt and llvm, etc.
-
-  #manylinux_2_28_with_qt_and_pyside:
-    #name: "Build the manylinux_2_28_with_qt_and_pyside image necessary for lima-python"
-    #runs-on: ubuntu-latest
-
-    #steps:
-      #-
-        #name: Login to DockerHub
-        #uses: docker/login-action@v2
-        #with:
-          #username: ${{ secrets.DOCKERHUB_USERNAME }}
-          #password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      #- name: "Checkout code"
-        #uses: actions/checkout@v3
-
-      ##- name: "Free disk space"
-        ##run: bash ./free-diskspace.sh
-
-      #- name: "Build image"
-        #run: cd ./continuous_integration && docker build --progress=plain -f Dockerfile-manylinux_2_28_with_qt_and_pyside --build-arg MANYLINUX_TAG="${MANYLINUX_TAG}" --build-arg BRANCH="${BRANCH}" --build-arg GCC_VERSION="${GCC_VERSION}" --build-arg LLVM_VERSION="${LLVM_VERSION}" --build-arg QT_FULL_VERSION="${QT_FULL_VERSION}" --build-arg QT_VERSION_MAJOR="${QT_VERSION_MAJOR}" --build-arg QT_VERSION_MINOR="${QT_VERSION_MINOR}" --build-arg QT_VERSION_PATCH="${QT_VERSION_PATCH}" --build-arg QT_VERSION="${QT_VERSION}" --build-arg PYSIDE_VERSION="${PYSIDE_VERSION}" --build-arg PYTHON_VERSION=${PYTHON_VERSION} --build-arg PYTHON_SHORT_VERSION=${PYTHON_SHORT_VERSION} --build-arg PYTHON_FULL_VERSION=${PYTHON_FULL_VERSION} -t aymara/manylinux_2_28_with_qt${QT_VERSION}_and_pyside-python${PYTHON_VERSION}:latest .
-
-      #- name: "Push image"
-        #run: docker push aymara/manylinux_2_28_with_qt${QT_VERSION}_and_pyside-python${PYTHON_VERSION}:latest
-
-  # manylinux_2_28_lima-manylinux:
-  #   name: "Build the manylinux_2_28_lima-manylinux image necessary for lima-python"
-  #   runs-on: ubuntu-latest
-  #
-  #   steps:
-  #     -
-  #       name: Login to DockerHub
-  #       uses: docker/login-action@v2
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
-  #
-  #     - name: "Checkout code"
-  #       uses: actions/checkout@v3
-  #
-  #     - name: "Build image"
-  #       run: cd ./continuous_integration && docker build -f Dockerfile-manylinux_2_28_lima-manylinux --build-arg MANYLINUX_TAG="${MANYLINUX_TAG}" --build-arg BRANCH="${{ github.ref_name }}" --build-arg GCC_VERSION="${GCC_VERSION}" --build-arg LLVM_VERSION="${LLVM_VERSION}" --build-arg QT_FULL_VERSION="${QT_FULL_VERSION}" --build-arg QT_VERSION_MAJOR="${QT_VERSION_MAJOR}" --build-arg QT_VERSION_MINOR="${QT_VERSION_MINOR}" --build-arg QT_VERSION_PATCH="${QT_VERSION_PATCH}" --build-arg QT_VERSION="${QT_VERSION}" --build-arg PYSIDE_VERSION="${PYSIDE_VERSION}" --build-arg PYTHON_VERSION=${PYTHON_VERSION} --build-arg PYTHON_SHORT_VERSION=${PYTHON_SHORT_VERSION} --build-arg PYTHON_FULL_VERSION=${PYTHON_FULL_VERSION} -t aymara/lima-manylinux_2_28-qt${QT_VERSION}-python${PYTHON_VERSION}:latest .
-  #
-  #     - name: "Push image"
-  #       run: docker push aymara/lima-manylinux_2_28-qt${QT_VERSION}-python${PYTHON_VERSION}:latest
 
   ubuntu22_04_lima:
     name: "Build the Ubuntu 22.04 Lima image"

continuous_integration/Dockerfile-debian12

@@ -2,19 +2,15 @@ FROM debian:12
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get clean && apt-get update && apt-get install -y locales locales-all
-
 ARG USE_TENSORFLOW="true"
-ARG GITHUB_TOKEN
+ARG GITHUB_TOKEN=none
 ARG LIMA_DISABLE_FSW_TESTING
 ARG LIMA_DISABLE_CPACK_DEBIAN_PACKAGE_SHLIBDEPS
 ARG NLTK_PTB_DP_FILE
 ARG QT_VERSION_MAJOR="6"
 
 # Setup
-RUN apt-get update -y -qq && apt-get install -y -qq apt-utils lsb-release git gcc g++ make curl python3-nltk gawk wget python3 ninja-build qt6-base-dev qt6-tools-dev libenchant-2-dev libtre-dev libboost-all-dev gnupg build-essential libssl-dev nodejs npm dos2unix unzip libeigen3-dev python3-pip python-is-python3 cmake
-
-RUN apt-get install -y -qq qml6-module-qtqml
+RUN apt-get clean && apt-get update && apt-get install -y -qq locales locales-all apt-utils lsb-release git gcc g++ make curl python3-nltk gawk wget python3 ninja-build qt6-base-dev qt6-tools-dev libenchant-2-dev libtre-dev libboost-all-dev gnupg build-essential libssl-dev nodejs npm dos2unix unzip libeigen3-dev python3-pip python-is-python3 cmake qml6-module-qtqml qt6-base-dev qt6-tools-dev libqt6concurrent6 libqt6qml6 qt6-base-dev-tools qt6-charts-dev qt6-declarative-dev qt6-declarative-dev-tools qt6-httpserver-dev qt6-multimedia-dev
 
 RUN wget https://launchpad.net/~limapublisher/+archive/ubuntu/ppa/+files/libtensorflow-for-lima-generic_1.9-ubuntu7~20.04_amd64.deb -q \
     && dpkg -i libtensorflow-for-lima-generic_1.9-ubuntu7~20.04_amd64.deb \
@@ -39,19 +35,15 @@ RUN cat nltk_data/corpora/dependency_treebank/wsj_*.dp | grep -v "^$" > nltk_dat
 
 WORKDIR /
 COPY continuous_integration/svmtool.sh  continuous_integration/svmtool-cpp.sh continuous_integration/qhttpserver.sh /
-RUN /svmtool.sh $GITHUB_TOKEN
-RUN /svmtool-cpp.sh $GITHUB_TOKEN
-RUN /qhttpserver.sh $GITHUB_TOKEN
+#RUN /svmtool.sh $GITHUB_TOKEN
+#RUN /svmtool-cpp.sh $GITHUB_TOKEN
+RUN /qhttpserver.sh $GITHUB_TOKEN debian12
 
 RUN mkdir -p /src/
 COPY ./extern /src/lima/extern
 WORKDIR /src/lima/extern
 RUN bash download_libtorch.sh
 
-RUN apt-get install -y -qq qt6-base-dev qt6-tools-dev qml6-module-qtqml qml6-module-qtquick qml6-module-qtquick-controls qml6-module-qtquick-layouts libqt6concurrent6 libqt6qml6 qt6-base-dev-tools qt6-charts-dev qt6-declarative-dev qt6-declarative-dev-tools qt6-httpserver-dev qt6-multimedia-dev
-
-#  libqt5xmlpatterns5-dev qtdeclarative5-dev qml6-module-qtquick-extras
-
 COPY . /src/lima
 WORKDIR /src/lima
 ARG CACHEBUST=1

continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux

@@ -2,6 +2,9 @@ ARG QT_VERSION
 ARG MANYLINUX_TAG
 FROM aymara/manylinux_2_28_with_qt${QT_VERSION}:latest as aymara_manylinux_2_28_with_qt
 
+FROM aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest  as aymara_qhttpserver-manylinux2.28-qt${QT_VERSION}
+FROM aymara/svmtoolpp-manylinux2.28-qt${QT_VERSION}:latest  as aymara_svmtoolpp-manylinux2.28-qt${QT_VERSION}
+
 ARG MANYLINUX_TAG
 FROM quay.io/pypa/manylinux_2_28_x86_64:${MANYLINUX_TAG}
 
@@ -23,6 +26,8 @@ COPY --from=aymara/manylinux_2_28_with_nltk_data:latest /nltk_data /nltk_data
 COPY --from=aymara/manylinux_2_28_with_tensorflow_for_lima_1_9:latest /tensorflow_for_lima /usr/local
 COPY --from=aymara_manylinux_2_28_with_qt /opt /opt
 COPY --from=aymara_manylinux_2_28_with_qt /usr/local /usr/local
+COPY --from=aymara_qhttpserver-manylinux2.28-qt${QT_VERSION} /opt/qhttpserver /usr
+COPY --from=aymara_svmtoolpp-manylinux2.28-qt${QT_VERSION} /opt/svmtool++ /usr
 
 ARG BRANCH=master
 ARG USE_TENSORFLOW="true"

continuous_integration/Dockerfile-ubuntu22.04

@@ -4,7 +4,7 @@ ARG PACKAGES="yes"
 ARG COMPILER="clang"
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update && apt-get install -y -qq locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qtbase5-dev-tools libqt5concurrent5 libqt5xmlpatterns5-dev libqt5qml5 qtdeclarative5-dev qml-module-qtquick-extras qml-module-qtquick-controls qml-module-qtquick-layouts qml-module-qtquick2 libtre-dev libboost-all-dev nodejs npm qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-privatewidgets qml-module-qtquick-scene3d qml-module-qtquick-templates2 qml-module-qtquick-virtualkeyboard qml-module-qtquick-window2 qml-module-qtquick-xmllistmodel libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn -qq
+RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update && apt-get install -y -qq locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6base-dev qt6base-dev-tools libqt6concurrent6 libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn
 
 # Use clang or gcc
 RUN bash -c 'if [[ "$COMPILER" == "clang" ]] ; then apt-get install -y -qq llvm clang clang-tidy clang-tools && update-alternatives --set cc /usr/bin/clang && update-alternatives --set c++ /usr/bin/clang++ ; else apt-get install -y -qq gcc g++ -qq ; fi'
@@ -39,9 +39,9 @@ RUN pwd
 RUN ls
 WORKDIR /
 COPY ./continuous_integration/svmtool.sh  ./continuous_integration/svmtool-cpp.sh ./continuous_integration/qhttpserver.sh /
-RUN /svmtool.sh $GITHUB_TOKEN
-RUN /svmtool-cpp.sh $GITHUB_TOKEN
-RUN /qhttpserver.sh $GITHUB_TOKEN
+#RUN /svmtool.sh $GITHUB_TOKEN
+#RUN /svmtool-cpp.sh $GITHUB_TOKEN
+RUN /qhttpserver.sh $GITHUB_TOKEN ubuntu22.04
 
 
 RUN install -d /src/lima/extern

continuous_integration/Dockerfile-ubuntu22.04-fia

@@ -37,8 +37,8 @@ RUN cat nltk_data/corpora/dependency_treebank/wsj_*.dp | grep -v "^$" > nltk_dat
 
 WORKDIR /
 COPY ./continuous_integration/svmtool.sh  ./continuous_integration/svmtool-cpp.sh ./continuous_integration/qhttpserver.sh /
-RUN /svmtool.sh $GITHUB_TOKEN
-RUN /svmtool-cpp.sh $GITHUB_TOKEN
+#RUN /svmtool.sh $GITHUB_TOKEN
+#RUN /svmtool-cpp.sh $GITHUB_TOKEN
 RUN /qhttpserver.sh $GITHUB_TOKEN
 
 

continuous_integration/qhttpserver.sh

@@ -8,13 +8,16 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+GITHUB_TOKEN="$1"
+DISTRIB="$2"
+
 QHTTPSERVER_LATEST_RELEASE_JSON=$(curl -s https://api.github.com/repos/aymara/qhttpserver/releases/latest)
 echo "QHTTPSERVER_LATEST_RELEASE_JSON=$QHTTPSERVER_LATEST_RELEASE_JSON"
 
-URL=$(echo "$QHTTPSERVER_LATEST_RELEASE_JSON"| grep browser_download_url | grep debian11 | grep '.deb"' | head -n 1 | cut -d '"' -f 4)
+URL=$(echo "$QHTTPSERVER_LATEST_RELEASE_JSON"| grep browser_download_url | grep "${DISTRIB}" | grep '.deb"' | head -n 1 | cut -d '"' -f 4)
 echo "URL=$URL"
 TEMP_DEB_DIR="$(mktemp -d)"
-curl  -LJ -H 'Accept: application/octet-stream' $URL --output-dir "$TEMP_DEB_DIR" --output release.tar
+curl  -LJ -H 'Accept: application/octet-stream' -H "Authorization: token ${GITHUB_TOKEN}" $URL --output-dir "$TEMP_DEB_DIR" --output release.tar
 pushd "$TEMP_DEB_DIR"
 tar xf ./release.tar
 dpkg -i *.deb

continuous_integration/svmtool-cpp.sh

@@ -10,14 +10,14 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-echo "Github API rate status: $(curl -i  https://api.github.com/repos/aymara/svmtool-cpp/releases/latest?access_token=$GITHUB_TOKEN) "
+echo "Github API rate status: $(curl -i -H 'Authorization: token ${GITHUB_TOKEN}' https://api.github.com/repos/aymara/svmtool-cpp/releases/latest)"
 
-SVMTOOL_LATEST_RELEASE_JSON=$(curl -s https://api.github.com/repos/aymara/svmtool-cpp/releases/latest?access_token=$GITHUB_TOKEN)
+SVMTOOL_LATEST_RELEASE_JSON=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/aymara/svmtool-cpp/releases/latest)
 echo "SVMTOOL_LATEST_RELEASE_JSON=$SVMTOOL_LATEST_RELEASE_JSON"
 
 URL=$(echo "$SVMTOOL_LATEST_RELEASE_JSON" | grep browser_download_url | grep debian9 | grep '.deb"' | head -n 1 | cut -d '"' -f 4)
 echo "URL=$URL"
 
 TEMP_DEB="$(mktemp)"
-curl  -LJ -H 'Accept: application/octet-stream' $URL?access_token=$GITHUB_TOKEN -o "$TEMP_DEB"
+curl  -LJ -H 'Accept: application/octet-stream' -H "Authorization: token ${GITHUB_TOKEN}" $URL -o "$TEMP_DEB"
 dpkg -i "$TEMP_DEB"

continuous_integration/svmtool.sh

@@ -11,7 +11,7 @@ set -o pipefail
 set -o nounset
 
 # apt install dos2unix
-wget -q --no-check-certificate https://osmot.cs.cornell.edu/svm_light/current/svm_light.tar.gz
+wget --no-check-certificate https://osmot.cs.cornell.edu/svm_light/current/svm_light.tar.gz
 install -d /svm_light
 pushd /svm_light
 tar xzf ../svm_light.tar.gz
@@ -37,15 +37,15 @@ cp svm_classify svm_learn /usr/bin
 popd
 rm -Rf /svm_light
 
-echo "Github API rate status: $(curl -i  https://api.github.com/repos/aymara/SVMTool/releases/latest?access_token=$GITHUB_TOKEN) "
+echo "Github API rate status: $(curl -i  -H 'Authorization: token ${GITHUB_TOKEN}' https://api.github.com/repos/aymara/SVMTool/releases/latest)"
 
-SVMTOOL_LATEST_RELEASE_JSON=$(curl -s https://api.github.com/repos/aymara/SVMTool/releases/latest?access_token=$GITHUB_TOKEN)
+SVMTOOL_LATEST_RELEASE_JSON=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/aymara/SVMTool/releases/latest)
 echo "SVMTOOL_LATEST_RELEASE_JSON=$SVMTOOL_LATEST_RELEASE_JSON"
 
 URL=$(echo "$SVMTOOL_LATEST_RELEASE_JSON" | grep browser_download_url |grep '.tgz"' | head -n 1 | cut -d '"' -f 4)
 echo "URL=$URL"
 
-curl  -LJ -H 'Accept: application/octet-stream' $URL?access_token=$GITHUB_TOKEN | tar xz
+curl  -LJ -H 'Accept: application/octet-stream'  -H "Authorization: token ${GITHUB_TOKEN}"  $URL | tar xz
 
 pushd SVMTool-1.3.1
 perl Makefile.PL

gbuild.sh

@@ -59,6 +59,7 @@ USE_TF=true
 TF_SOURCES_PATH=""
 WITH_GUI="ON"
 LIMA_SOURCES=$PWD
+QT_VERSION_MAJOR="6"
 
 while getopts ":d:m:n:r:v:G:a:p:P:st:Tj:g:" o; do
     case "${o}" in
@@ -256,6 +257,7 @@ export ASAN_OPTIONS=halt_on_error=0,fast_unwind_on_malloc=0
 
 echoerr "Launching cmake from $PWD on $source_dir WITH_ASAN=$WITH_ASAN"
 cmake  -G "$generator" \
+    -DQT_VERSION_MAJOR=${QT_VERSION_MAJOR} \
     -DWITH_DEBUG_MESSAGES=$WITH_DEBUG_MESSAGES \
     -DWITH_ARCH=$WITH_ARCH \
     -DWITH_ASAN=$WITH_ASAN \

lima_linguisticdata/disambiguisationMatrices/eng/corpus/SVMToolModel/CMakeLists.txt

@@ -4,21 +4,21 @@
 # SPDX-License-Identifier: MIT
 
 find_program (SVMT_LEARN SVMTlearn)
-find_program (SVM_LIGHT_PROGRAM svm_learn)
+find_program (SVM_LEARN_PROGRAM svm_learn)
 
 if ( ${SVMT_LEARN} STREQUAL "SVMT_LEARN-NOTFOUND" )
 
   message("SVMTlearn not found. eng SVMTool model will not build.")
 
-elseif ( ${SVM_LIGHT_PROGRAM} STREQUAL "SVM_LIGHT_PROGRAM-NOTFOUND" )
+elseif ( ${SVM_LEARN_PROGRAM} STREQUAL "SVM_LEARN_PROGRAM-NOTFOUND" )
 
-  message("svm_light not found. eng SVMTool model will not build.")
+  message("svm_learn not found. eng SVMTool model will not build.")
 
 else ()
   message("SVMTlearn is ${SVMT_LEARN}.")
-  message("svm_light is ${SVM_LIGHT_PROGRAM}.")
+  message("svm_light is ${SVM_LEARN_PROGRAM}.")
 
-  get_filename_component(SVM_LIGHT ${SVM_LIGHT_PROGRAM} DIRECTORY)
+  get_filename_component(SVM_LIGHT ${SVM_LEARN_PROGRAM} DIRECTORY)
 
   configure_file(config-minimale.SVMT config-minimale.SVMT @ONLY)
 

lima_linguisticdata/disambiguisationMatrices/fre/corpus/SVMToolModel/CMakeLists.txt

@@ -4,21 +4,21 @@
 # SPDX-License-Identifier: MIT
 
 find_program (SVMT_LEARN SVMTlearn)
-find_program (SVM_LIGHT_PROGRAM svm_learn)
+find_program (SVM_LEARN_PROGRAM svm_learn)
 
 if ( ${SVMT_LEARN} STREQUAL "SVMT_LEARN-NOTFOUND" )
 
   message("SVMTlearn not found. fre SVMTool model will not build.")
 
-elseif ( ${SVM_LIGHT_PROGRAM} STREQUAL "SVM_LIGHT_PROGRAM-NOTFOUND" )
+elseif ( ${SVM_LEARN_PROGRAM} STREQUAL "SVM_LEARN_PROGRAM-NOTFOUND" )
 
-  message("svm_light not found. fre SVMTool model will not build.")
+  message("svm_learn not found. fre SVMTool model will not build.")
 
 else ()
   message("SVMTlearn is ${SVMT_LEARN}.")
-  message("svm_light is ${SVM_LIGHT_PROGRAM}.")
+  message("svm_light is ${SVM_LEARN_PROGRAM}.")
 
-  get_filename_component(SVM_LIGHT ${SVM_LIGHT_PROGRAM} DIRECTORY)
+  get_filename_component(SVM_LIGHT ${SVM_LEARN_PROGRAM} DIRECTORY)
 
   configure_file(config-minimale.SVMT config-minimale.SVMT @ONLY)