build stuff

opentrv · Jul 16, 2020 · e172ed7 · e172ed7
1 parent 188f82d
commit e172ed7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,8 +34,8 @@
 /tmptestexe
 
 # ninja
+/build
 /builddir
-/buildclang
 /subprojects
 
 # vscode

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -1,93 +1,16 @@
 {
     "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ],
-            "compilerPath": "/bin/clang",
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        },
         {
             "name": "Linux",
             "includePath": [
-                "/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7",
-                "/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/x86_64-redhat-linux",
-                "/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/backward",
-                "/usr/lib/gcc/x86_64-redhat-linux/7/include",
-                "/usr/local/include",
-                "/usr/include",
-                "/opt/arduino/hardware/arduino/avr/cores/arduino",
-                "/opt/arduino/hardware/arduino/avr/libraries",
-                "/opt/arduino/hardware/arduino/avr/variants/standard",
-                "/opt/arduino/hardware/tools/avr/avr/include",
-                "${workspaceRoot}",
-                "${workspaceRoot}/content/OTAESGCM"
+                "${workspaceFolder}/**"
             ],
             "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7",
-                    "/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/x86_64-redhat-linux",
-                    "/usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/backward",
-                    "/usr/lib/gcc/x86_64-redhat-linux/7/include",
-                    "/usr/local/include",
-                    "/usr/include",
-                    "/opt/arduino/hardware/arduino/avr/cores/arduino",
-                    "/opt/arduino/hardware/arduino/avr/libraries",
-                    "/opt/arduino/hardware/arduino/avr/variants/standard",
-                    "/opt/arduino/hardware/tools/avr/avr/include",
-                    "${workspaceRoot}",
-                    "${workspaceRoot}/content/OTAESGCM"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "compilerPath": "/usr/bin/gcc",
+            "compilerPath": "/usr/bin/clang",
             "cStandard": "c11",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "Win32",
-            "includePath": [
-                "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
-                "${workspaceRoot}"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "compilerPath": "/bin/clang",
-            "cStandard": "c11",
-            "cppStandard": "c++17"
+            "cppStandard": "c++11",
+            "intelliSenseMode": "clang-x64",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
         }
     ],
     "version": 4

diff --git a/.vscode/clean.sh b/.vscode/clean.sh
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,19 +1,13 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "test",
-            "type": "shell",
-            "command": ".vscode/tests.sh",
-            "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": false,
-                "panel": "shared"
-            },
-            "problemMatcher": "$gcc"
-        }
-    ]
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "meson",
+			"target": "OTAESGCMTests",
+			"mode": "build",
+			"group": "build",
+			"problemMatcher": [],
+			"label": "Meson: Build OTAESGCMTests"
+		}
+	]
 }
diff --git a/.vscode/tests.sh b/.vscode/tests.sh
diff --git a/meson.build b/meson.build
@@ -51,18 +51,18 @@ src = [
     'content/OTAESGCM/utility/OTAESGCM_OTAESGCM.cpp',
 ]
 
-libOTAESGCM = static_library('OTAESGCM', src,
-    include_directories : inc,
-    cpp_args : cpp_args,
-    install : true
-)
-
-libOTAESGCM_dep = declare_dependency(
-    include_directories : inc, 
-    link_with : libOTAESGCM
-)
+if meson.is_subproject()
+    libOTAESGCM = static_library('OTAESGCM', src,
+        include_directories : inc,
+        cpp_args : cpp_args,
+        install : true
+    )
 
-if not meson.is_subproject()
+    libOTAESGCM_dep = declare_dependency(
+        include_directories : inc, 
+        link_with : libOTAESGCM
+    )
+else
     # Compile test executable.
     # This is broken out to avoid compile errors due to lack of gtest.
     test_src = 'portableUnitTests/main.cpp'