Release v2.6

commschamp · Mar 4, 2024 · d3aaf8e · d3aaf8e
2 parents e245fce + acf57af
commit d3aaf8e
Show file tree

Hide file tree

Showing 35 changed files with 2,026 additions and 170 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,6 @@
 image:
     - Visual Studio 2022  
     - Visual Studio 2019  
-    - Visual Studio 2017    
 
 
 init:
@@ -19,20 +18,28 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: v5.2.1
-    COMMSDSL_BRANCH: v6.2.4
-    CC_TOOLS_QT_BRANCH: v4.2.3
+    COMMS_BRANCH: v5.2.2
+    COMMSDSL_BRANCH: v6.3
+    CC_TOOLS_QT_BRANCH: v5.1
     matrix:
         - CPP_STD: 11
+          QT_MAJOR: 5
+          EXTRA_CONFIG: -DUBLOX_BUILD_TOOLS=OFF
         - CPP_STD: 14
+          QT_MAJOR: 5
+          EXTRA_CONFIG: -DUBLOX_BUILD_TOOLS=OFF
         - CPP_STD: 17
+          QT_MAJOR: 5
         - CPP_STD: 20
+          QT_MAJOR: 5          
+        - CPP_STD: 20
+          QT_MAJOR: 6
 
 matrix:
     fast_finish: false
     exclude:
-        - image: Visual Studio 2017
-          CPP_STD: 20                           
+        - platform: x86
+          QT_MAJOR: 6                                  
 
 install:
     - call script\appveyor_install.bat
@@ -45,13 +52,21 @@ install:
     - set COMMON_INSTALL_DIR=%BUILD_DIR%\install
     - set COMMON_BUILD_TYPE=%CONFIGURATION%
     - set COMMON_CXX_STANDARD=%CPP_STD%
+    - set GENERATOR="%CMAKE_GENERATOR%"
+    - set PLATFORM="%CMAKE_PLATFORM%"    
+    - set CC_TOOLS_QT_MAJOR_QT_VERSION=%QT_MAJOR%
     - call script\prepare_externals.bat
 
 build_script:
     - echo ------------------------- Building Project -------------------------
     - cd %BUILD_DIR%
-    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DBOOST_ROOT="%BOOST_DIR%" -DBoost_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCMAKE_CXX_STANDARD=%CPP_STD% -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_EXAMPLES=ON -DUBLOX_SCHEMA_FILES_LIST_FILE=%APPVEYOR_BUILD_FOLDER%/basic_msgs.txt
-    - cmake --build . --config %CONFIGURATION% --target install
+    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" %PLATFORM_PARAM% ^
+        -DBOOST_ROOT="%BOOST_DIR%" -DBoost_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" ^
+        -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCMAKE_CXX_STANDARD=%CPP_STD% ^
+        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_EXAMPLES=ON ^
+        -DUBLOX_SCHEMA_FILES_LIST_FILE=%APPVEYOR_BUILD_FOLDER%/basic_msgs.txt        
+        -DUBLOX_TOOLS_QT_VER=%QT_MAJOR% %EXTRA_CONFIG%
+    - cmake --build . --config %CONFIGURATION% --target install --parallel %NUMBER_OF_PROCESSORS%
 
 
 
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -3,9 +3,9 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: v5.2.1
-  COMMSDSL_BRANCH: v6.2.4
-  CC_TOOLS_QT_BRANCH: v4.2.3
+  COMMS_BRANCH: v5.2.2
+  COMMSDSL_BRANCH: v6.3
+  CC_TOOLS_QT_BRANCH: v5.1
 
 jobs:
   build_gcc_old_ubuntu_20_04:
@@ -125,11 +125,12 @@ jobs:
       run: |
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
-        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_EXAMPLES=ON \
+        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} -DUBLOX_BUILD_EXAMPLES=ON \
         -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
       env:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -146,6 +147,7 @@ jobs:
         type: [Debug, Release, MinSizeRel]
         cc_ver: [9, 10, 11, 12]
         cpp: [11, 14, 17, 20]
+        qt_ver: [5, 6]
 
     steps:
     - uses: actions/checkout@v2
@@ -155,7 +157,7 @@ jobs:
 
     - name: Install Packages
       run: |
-        sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
+        sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libboost-all-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
         python3 libpython3-dev swig default-jdk default-jre emscripten
 
     - name: Create Build Environment
@@ -175,19 +177,21 @@ jobs:
         COMMS_TAG: ${{env.COMMS_BRANCH}}
         COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
         CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
 
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
-        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON \
-        -DUBLOX_GEN_SWIG=ON -DUBLOX_GEN_EMSCRIPTEN=ON -DUBLOX_BUILD_EXAMPLES=ON \
+        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
+        -DUBLOX_GEN_SWIG=ON -DUBLOX_GEN_EMSCRIPTEN=ON -DUBLOX_BUILD_EXAMPLES=ON -DUBLOX_TOOLS_QT_VER=${{matrix.qt_ver}} \
         -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
       env:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -251,11 +255,12 @@ jobs:
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
         -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON \
-        -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_EXAMPLES=ON \
+        -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} -DUBLOX_BUILD_EXAMPLES=ON \
         -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -304,18 +309,20 @@ jobs:
         COMMS_TAG: ${{env.COMMS_BRANCH}}
         COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
         CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}} 
+        CC_TOOLS_QT_SKIP: "${{ matrix.cpp < 17 && '1' || '0' }}"
 
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
-        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_EXAMPLES=ON \
-        -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
+        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
+        -DUBLOX_BUILD_EXAMPLES=ON -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ matrix.cpp == 17 && 'ON' || 'OFF' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -330,8 +337,9 @@ jobs:
       fail-fast: false
       matrix:
         type: [Debug, Release, MinSizeRel]
-        cc_ver: [12, 13, 14]
+        cc_ver: [12, 13, 14, 15]
         cpp: [11, 14, 17, 20]
+        qt_ver: [5, 6]
 
     steps:
     - uses: actions/checkout@v2
@@ -341,7 +349,7 @@ jobs:
 
     - name: Install Packages
       run: |
-        sudo apt install libqt5gui5 qtbase5-dev libboost-all-dev libxml2-dev clang-${{matrix.cc_ver}} \
+        sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libboost-all-dev libxml2-dev clang-${{matrix.cc_ver}} \
         python3 libpython3-dev swig  default-jdk default-jre emscripten
 
     - name: Create Build Environment
@@ -361,19 +369,22 @@ jobs:
         COMMS_TAG: ${{env.COMMS_BRANCH}}
         COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
         CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}} 
+        CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
+        CC_TOOLS_QT_SKIP: "${{ (matrix.cpp < 17 || (matrix.cpp == 20 && matrix.cc_ver < 15)) && '1' || '0' }}"
 
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
       run: |
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
-        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON \
-        -DUBLOX_GEN_SWIG=ON -DUBLOX_GEN_EMSCRIPTEN=ON -DUBLOX_BUILD_EXAMPLES=ON \
+        -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
+        -DUBLOX_GEN_SWIG=ON -DUBLOX_GEN_EMSCRIPTEN=ON -DUBLOX_BUILD_EXAMPLES=ON -DUBLOX_TOOLS_QT_VER=${{matrix.qt_ver}} \
         -DUBLOX_SCHEMA_FILES_LIST_FILE=$GITHUB_WORKSPACE/basic_msgs.txt
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
+        BUILD_TOOLS: "${{ (matrix.cpp < 17 || (matrix.cpp == 20 && matrix.cc_ver < 15)) && 'OFF' || 'ON' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,9 @@ option (UBLOX_BUILD_EXAMPLES "Build examples." OFF)
 # UBLOX_PROT_OUTPUT_DIR - Path to protocol output directory. If not provided <build_dir>/output one is used.
 # UBLOX_TEST_OUTPUT_DIR - Path to test output directory. If not provided <build_dir>/output_tools one is used.
 # UBLOX_TOOLS_OUTPUT_DIR - Path to tools output directory. If not provided <build_dir>/output_tools one is used.
+# UBLOX_TOOLS_QT_VER - Major Qt version to be used when building tools output. Defaults to 5
 # UBLOX_SWIG_OUTPUT_DIR - Path to swig output directory. If not provided <build_dir>/output_swig one is used.
+# UBLOX_SWIG_SRC_DIR - Path to the commsdsl2swig sources. If not provided local "src/swig" dir is used.
 # UBLOX_SCHEMA_FILES_LIST_FILE - Path to the file containing list of DSL files, use it to replace "schema_files" list below.
 # UBLOX_EMSCRIPTEN_OUTPUT_DIR - Path to emscripten output directory. If not provided <build_dir>/output_emscripten one is used.
 # COMMSDSL2COMMS_EXTRA_ARGS - Extra arguments to pass to "commsdsl2comms"
@@ -30,8 +32,8 @@ option (UBLOX_BUILD_EXAMPLES "Build examples." OFF)
 # COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
 # COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
 
-set (UBLOX_VERSION "2.5")
-set (UBLOX_MIN_COMMSDSL_VERSION "6.2.4")
+set (UBLOX_VERSION "2.6")
+set (UBLOX_MIN_COMMSDSL_VERSION "6.3")
 
 set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
 
@@ -54,7 +56,7 @@ if ("${UBLOX_SWIG_OUTPUT_DIR}" STREQUAL "")
 endif ()
 
 if ("${UBLOX_SWIG_SRC_DIR}" STREQUAL "")
-    set (UBLOX_SWIG_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/swig_src)
+    set (UBLOX_SWIG_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/swig)
 endif ()
 
 if ("${UBLOX_SWIG_LANGUAGES}" STREQUAL "")
@@ -231,7 +233,6 @@ endif ()
 set (prot_tmp_dir "${CMAKE_BINARY_DIR}/output.tmp")
 set (test_tmp_dir "${CMAKE_BINARY_DIR}/output_test.tmp")
 set (tools_tmp_dir "${CMAKE_BINARY_DIR}/output_tools.tmp")
-set (code_input_dir "${PROJECT_SOURCE_DIR}/src")
 
 if ("${UBLOX_PROT_OUTPUT_DIR}" STREQUAL "")
     set (UBLOX_PROT_OUTPUT_DIR "${CMAKE_BINARY_DIR}/output")
@@ -268,23 +269,16 @@ if (UBLOX_GEN_PROTOCOL)
         OUTPUT ${prot_tmp_dir}
         DEPENDS ${schema_files} ${src_files} rm_prot_tmp_tgt
         COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${UBLOX_VERSION}
-            -o ${prot_tmp_dir} 
-            -c ${code_input_dir} -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
+            -o ${prot_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/protocol
+            -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
             ${COMMSDSL2COMMS_EXTRA_ARGS} 
     )
 
-    set (readme_file "${prot_tmp_dir}/README.md")
-    add_custom_command(
-        OUTPUT ${readme_file}
-        DEPENDS ${prot_tmp_dir} 
-        COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/readme.generated ${readme_file}
-    )
-
     add_custom_target(${PROT_OUTPUT_TGT} ALL
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${prot_tmp_dir}" -DOUTPUT="${UBLOX_PROT_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"
-        DEPENDS ${prot_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_files})
+        DEPENDS ${prot_tmp_dir} ${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake ${schema_files})
 
     if (UBLOX_BUILD_PROTOCOL)
         execute_process(
@@ -345,7 +339,8 @@ if (UBLOX_GEN_TEST)
         OUTPUT ${test_tmp_dir}
         DEPENDS ${schema_files} ${src_files} rm_test_tmp_tgt
         COMMAND ${COMMSDSL2TEST} ${warn_as_error} ${COMMSDSL2TEST_EXTRA_ARGS}
-            -o ${test_tmp_dir} -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
+            -o ${test_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/test
+            -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
     )
 
     add_custom_target("test_output_tgt" ALL
@@ -405,7 +400,9 @@ if (UBLOX_GEN_TOOLS)
         OUTPUT ${tools_tmp_dir}
         DEPENDS ${schema_files} ${src_files} rm_tools_tmp_tgt
         COMMAND ${COMMSDSL2TOOLS_QT} ${warn_as_error} ${COMMSDSL2TOOLS_QT_EXTRA_ARGS}
-            -o ${tools_tmp_dir} -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
+            --protocol "::CC UBLOX:UBX protocol used by the U-blox GNSS Receivers.:cc.UbloxProtocolPlugin"
+            -o ${tools_tmp_dir}  -c ${PROJECT_SOURCE_DIR}/src/tools
+            -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
     )
 
     add_custom_target("tools_output_tgt" ALL
@@ -442,6 +439,7 @@ if (UBLOX_GEN_TOOLS)
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}           
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
+                -DOPT_QT_MAJOR_VERSION=${UBLOX_TOOLS_QT_VER}
         )  
     endif ()
 endif ()
@@ -463,7 +461,7 @@ if (UBLOX_GEN_SWIG)
         OUTPUT ${swig_tmp_dir}
         DEPENDS ${schema_files} ${src_files} rm_swig_tmp_tgt
         COMMAND ${COMMSDSL2SWIG} ${warn_as_error} ${COMMSDSL2SWIG_EXTRA_ARGS}
-            -c ${CMAKE_CURRENT_SOURCE_DIR}/swig_src -o ${swig_tmp_dir} 
+            -c ${UBLOX_SWIG_SRC_DIR} -o ${swig_tmp_dir} 
             -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
     )
 
@@ -486,6 +484,8 @@ if (UBLOX_GEN_SWIG)
             COMMAND ${CMAKE_COMMAND} -E touch ${UBLOX_SWIG_OUTPUT_DIR}/dummy.txt
         )
 
+        string (REPLACE ";" "|" combined_languages_str "${UBLOX_SWIG_LANGUAGES}")
+
         set (swig_build_dir ${CMAKE_CURRENT_BINARY_DIR}/swig_tgt_build)
         ExternalProject_Add(
             "swig_tgt"
@@ -501,7 +501,7 @@ if (UBLOX_GEN_SWIG)
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}        
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
-                -DOPT_SWIG_LANGUAGES=python|java|csharp
+                -DOPT_SWIG_LANGUAGES=${combined_languages_str}
             INSTALL_COMMAND
                 ${CMAKE_COMMAND} -E echo "Skipping install"            
         )   
@@ -526,7 +526,8 @@ if (UBLOX_GEN_EMSCRIPTEN)
         OUTPUT ${emscripten_tmp_dir}
         DEPENDS ${schema_files} ${src_files} rm_emscripten_tmp_tgt
         COMMAND ${COMMSDSL2EMSCRIPTEN} ${warn_as_error} ${COMMSDSL2EMSCRIPTEN_EXTRA_ARGS}
-            -o ${emscripten_tmp_dir} -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
+            -o ${emscripten_tmp_dir} -c ${PROJECT_SOURCE_DIR}/src/emscripten
+            -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
     )
 
     add_custom_target("emscripten_output_tgt" ALL