minor cleanup

CMakeLists.txt

@@ -23,7 +23,6 @@ project ("WolframLibraryLink_libCZI")
 
 # include RapidJSON -> https://www.jibbow.com/posts/rapidjson-cmake/
 include("${CMAKE_SOURCE_DIR}/modules/rapidJSON.cmake")
-#include_directories(${RAPIDJSON_INCLUDE_DIR})
 
 message(STATUS ${CMAKE_MODULE_PATH} )
 
@@ -36,10 +35,6 @@ endif(WLLCZI_MATHEMATICAHEADERS)
 message(STATUS "Mathematica_INCLUDE_DIR: ${Mathematica_INCLUDE_DIR}")
 message(STATUS "Mathematica_WolframLibrary_LIBRARIES: ${Mathematica_WolframLibrary_LIBRARIES}")
 
-#include_directories("C:/Program Files/Wolfram Research/Mathematica/12.0/SystemFiles/IncludeFiles/C")
-#include_directories("C:/Program Files/Wolfram Research/Mathematica/12.0/SystemFiles/Links/WSTP/DeveloperKit/Windows-x86-64/CompilerAdditions")
-
-
 include("${CMAKE_SOURCE_DIR}/modules/libCZI.cmake")
 FetchContent_GetProperties(libCZI)
 set(LIBCZI_INCLUDE_DIR "${libczi_SOURCE_DIR}/Src/libCZI")

azure-pipelines.yml

@@ -65,7 +65,7 @@ jobs:
   - task: DownloadSecureFile@1
     inputs:
       secureFile: 'zippw.txt'
-  - script: env;mkdir ~/artifacts;mkdir ~/artifacts/Winx86;mkdir ~/artifacts/Winx64;mkdir ~/artifacts/Linuxx64
+  - script: mkdir ~/artifacts;mkdir ~/artifacts/Winx86;mkdir ~/artifacts/Winx64;mkdir ~/artifacts/Linuxx64
     displayName: 'Make folders where to put the Windows-binaries'
   - task: DownloadPipelineArtifact@2
     inputs:
@@ -97,14 +97,11 @@ jobs:
       zippw=`cat $(Agent.TempDirectory)/zippw.txt`
       cp  $(Agent.BuildDirectory)/artifacts/Winx64/* ~/artifacts/Winx64
       cp  $(Agent.BuildDirectory)/artifacts/Winx86/* ~/artifacts/Winx86
-      #ls -l -R ~/artifacts
       sudo apt-get -qq update 
       sudo apt-get -qq install qemu-system-arm expect
       qemu-system-arm --version
-      #uname -a
-      #lscpu
-      #pwd
-      #echo ${HOME}
+      uname -a
+      lscpu
       sudo modprobe nbd max_part=8   # enable NBD on the host
       wget "https://onedrive.live.com/download?cid=A78BEB4649B27A1A&resid=A78BEB4649B27A1A%21524673&authkey=ADOgFOWKONZdQK0" -O raspiqemu.zip --no-verbose
       unzip -P "$zippw" raspiqemu.zip    
@@ -118,10 +115,8 @@ jobs:
       sudo mkdir /mnt/raspi/home/pi/EXTDATA
       sudo chmod 777 /mnt/raspi/home/pi/EXTDATA
       sudo cp -r ~/artifacts /mnt/raspi/home/pi/EXTDATA
-      #sudo ls -l -R /mnt/raspi/home/pi/EXTDATA
       sudo umount /mnt/raspi/
       sudo qemu-nbd --disconnect /dev/nbd0
-      #sudo rmmod nbd
       cp CI/autorun.expect raspiwllczibuildsystem/autorun.expect
       cp CI/run_raspi.sh raspiwllczibuildsystem/run_raspi.sh
       chmod +x raspiwllczibuildsystem/autorun.expect

wllczi/CMakeLists.txt

@@ -58,8 +58,6 @@ target_link_libraries(wllczi PRIVATE libCZIStatic JxrDecodeStatic)
 
 target_include_directories(wllczi PRIVATE ${Mathematica_INCLUDE_DIR} ${LIBCZI_INCLUDE_DIR}  ${RAPIDJSON_INCLUDE_DIR})
 
-#target_link_libraries(wllczi PRIVATE "C:/Program Files/Wolfram Research/Mathematica/12.0/SystemFiles/Links/WSTP/DeveloperKit/Windows-x86-64/CompilerAdditions/wstp64i4.lib")
-
 target_compile_definitions(wllczi PRIVATE WLLCZI_EXPORTS)
 
 target_include_directories(wllczi PRIVATE  ${CMAKE_CURRENT_BINARY_DIR})  # this is necessary so that we can find "wllczi_Config.h" which we created above
@@ -114,14 +112,10 @@ add_library (wllczi_static STATIC
 
 set_target_properties(wllczi_static PROPERTIES CXX_STANDARD 11)
 
-#add_dependencies(wllczi_static rapidjson)
-
 target_include_directories(wllczi_static PRIVATE ${Mathematica_INCLUDE_DIR} ${LIBCZI_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
 
 target_link_libraries(wllczi_static PRIVATE libCZIStatic JxrDecodeStatic)
 
-#target_link_libraries(wllczi_static PRIVATE "C:/Program Files/Wolfram Research/Mathematica/12.0/SystemFiles/Links/WSTP/DeveloperKit/Windows-x86-64/CompilerAdditions/wstp64i4.lib")
-
 target_include_directories(wllczi_static PRIVATE  ${CMAKE_CURRENT_BINARY_DIR})  # this is necessary so that we can find "wllczi_Config.h" which we created above
 
 target_compile_definitions(wllczi_static PRIVATE _WLLCZISTATICLIB)