ChemCryst · richardicooper · Dec 18, 2019 · Dec 18, 2019 · Feb 5, 2020 · May 18, 2020
diff --git a/.github/workflows/CI-intel-python.yml b/.github/workflows/CI-intel-python.yml
diff --git a/.github/workflows/CI-intel.yml b/.github/workflows/CI-intel.yml
@@ -190,8 +190,8 @@ jobs:
         set CRYVMINOR=${{ steps.get_version.outputs.minor }}
         set CRYVPATCH=${{ steps.get_version.outputs.patch }}
         echo Commit SHA: %CRYSVNVER% Version: %CRYVMAJOR%.%CRYVMINOR%.%CRYVPATCH%
-        cmake .. -G"NMake Makefiles" -DuseGUI=${{ matrix.guiflag }} -DCMAKE_SH="CMAKE_SH-NOTFOUND" ${{ matrix.wxoptions }} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DuseCustomMKL=yes
-        nmake
+        cmake .. -G"NMake Makefiles" -DuseGUI=${{ matrix.guiflag }} -DCMAKE_SH="CMAKE_SH-NOTFOUND" ${{ matrix.wxoptions }} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DuseCustomMKL=yes -DusePY=no -DCMAKE_EXPORT_COMPILE_COMMANDS=on
+        nmake || exit /b %ERRORLEVEL%
         copy ..\wx\lib\vc14x_x64_dll\wxmsw314u_stc_vc14x_x64.dll . 
         copy ..\wx\lib\vc14x_x64_dll\wxmsw314u_core_vc14x_x64.dll .
         copy ..\wx\lib\vc14x_x64_dll\wxmsw314u_gl_vc14x_x64.dll . 
@@ -327,6 +327,14 @@ jobs:
 #        name: executable-outputs-win64-${{ matrix.cl }}
 #        path: ci
 
+# Could be useful for debugging
+    - name: Upload compile_commands 
+      uses: actions/upload-artifact@v1
+      with:
+        name: commands-win64-${{ matrix.cl }}-${{ matrix.release }}
+        path: ci/compile_commands.json
+
+
 
     - name: Build installer
       if:  ${{ matrix.cl == 'gui' }}

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -17,6 +17,7 @@ jobs:
       matrix:
         cl: [gui, nogui]
         release: [debug, release]
+        withpython: [yes, no]
         include:
 # Setup some GUI/NOGUI specific variables
         - cl: gui
@@ -61,8 +62,9 @@ jobs:
     - name: Build CRYSTALS linux
       working-directory: ci
       run: |
-        cmake -DuseGUI=${{ matrix.guiflag }} -DuseOPENMP=no  -DCMAKE_BUILD_TYPE=${{ matrix.release }} ..
+        cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DuseGUI=${{ matrix.guiflag }} -DuseOPENMP=no -DusePY=${{ matrix.withpython }} -DCMAKE_BUILD_TYPE=${{ matrix.release }} ..
         make -j2
+        cat compile_commands.json
 
 #
     - name: Test CRYSTALS linux

diff --git a/.gitignore b/.gitignore
@@ -58,12 +58,17 @@ script/old-bak-files
 
 #common build folders
 b/
+c/
+e/
 d/
 g/
 i/
 c/
 n/
 p/
+t/
+pi/
+pp/
 cl/
 nm/
 o/
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,12 +58,17 @@ script/old-bak-files @@
     #common build folders
     b/
+    c/
+    e/
     d/
     g/
     i/
     c/
     n/
     p/
+    t/
+    pi/
+    pp/
     cl/
     nm/
     o/
@@ Expand Down @@