Merge pull request #22 from Jhuighuy/cmake-refactoring

CMake refactoring
Jhuighuy · Sep 15, 2023 · 41a9221 · 41a9221
2 parents ce12b8a + f0c10e6
commit 41a9221
Show file tree

Hide file tree

Showing 11 changed files with 220 additions and 203 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -19,21 +19,26 @@
 // IN THE SOFTWARE.
 {
  "env": {
- "theIncludePaths": [
+ "includePath": [
  "${workspaceFolder}/source"
  ],
- "theVcpkgPackagesPath": "${workspaceFolder}/build/vcpkg_installed",
- "theMacFrameworkPaths": [
- "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks"
+ "vcpkgPackagesPath": "${workspaceFolder}/build/vcpkg_installed",
+ "brewIncludePath": [
+ "/opt/homebrew/include",
+ "/opt/homebrew/Frameworks/*.framework/Headers"
+ ],
+ // TODO: Looks like `macFrameworkPath` is broken.
+ "macFrameworkPaths": [
+ "/opt/homebrew/Frameworks"
  ]
  },
  "configurations": [
  // -------------------------------------------------------------------------
  {
  "name": "Linux (gcc-12-x64)",
  "includePath": [
- "${theVcpkgPackagesPath}/x64-linux/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${vcpkgPackagesPath}/x64-linux/include"
  ],
  "compilerPath": "/usr/bin/g++-12",
  "cppStandard": "c++23",
@@ -43,8 +48,8 @@
  {
  "name": "Linux (gcc-13-x64)",
  "includePath": [
- "${theVcpkgPackagesPath}/x64-linux/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${vcpkgPackagesPath}/x64-linux/include"
  ],
  "compilerPath": "/usr/bin/g++-13",
  "cppStandard": "c++23",
@@ -54,8 +59,8 @@
  {
  "name": "Linux (clang-15-x64)",
  "includePath": [
- "${theVcpkgPackagesPath}/x64-linux/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${vcpkgPackagesPath}/x64-linux/include"
  ],
  "compilerPath": "/usr/bin/clang++-15",
  "cppStandard": "c++23",
@@ -65,12 +70,12 @@
  {
  "name": "Mac (gcc-12-arm64)",
  "includePath": [
- "/opt/homebrew/include",
- "${theVcpkgPackagesPath}/arm64-osx/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${brewIncludePath}",
+ "${vcpkgPackagesPath}/arm64-osx/include"
  ],
  "macFrameworkPath": [
- "${theMacFrameworkPaths}"
+ "${macFrameworkPaths}"
  ],
  "compilerPath": "/opt/homebrew/bin/g++-12",
  "cppStandard": "c++23",
@@ -80,54 +85,47 @@
  {
  "name": "Mac (gcc-13-arm64)",
  "includePath": [
- "/opt/homebrew/include",
- "${theVcpkgPackagesPath}/arm64-osx/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${brewIncludePath}",
+ "${vcpkgPackagesPath}/arm64-osx/include"
  ],
  "macFrameworkPath": [
- "${theMacFrameworkPaths}"
+ "${macFrameworkPaths}"
  ],
  "compilerPath": "/opt/homebrew/bin/g++-13",
  "cppStandard": "c++23",
  "intelliSenseMode": "macos-gcc-arm64"
  },
  // -------------------------------------------------------------------------
  {
- "name": "Mac (clang-15-arm64)",
+ "name": "Mac (clang-16-arm64)",
  "includePath": [
- "/opt/homebrew/include",
- "${theVcpkgPackagesPath}/arm64-osx/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${brewIncludePath}",
+ "${vcpkgPackagesPath}/arm64-osx/include"
  ],
  "macFrameworkPath": [
- "${theMacFrameworkPaths}"
+ "${macFrameworkPaths}"
  ],
- "compilerPath": "/opt/homebrew/opt/llvm/bin/clang-15",
+ "compilerPath": "/opt/homebrew/opt/llvm/bin/clang-16",
  "cppStandard": "c++23",
  "intelliSenseMode": "macos-clang-arm64"
  },
+ // -------------------------------------------------------------------------
  // TODO: Add Mac (x64) configuratiuons.
  // -------------------------------------------------------------------------
  {
  "name": "Windows (msvc-x64)",
  "includePath": [
- "${theVcpkgPackagesPath}/arm64-osx/include",
- "${theIncludePaths}"
+ "${includePath}",
+ "${vcpkgPackagesPath}/msvc-x64/include"
  ],
  "cppStandard": "c++23",
  "intelliSenseMode": "windows-msvc-x64"
- },
- // -------------------------------------------------------------------------
- {
- "name": "Windows (msvc-x64)",
- "includePath": [
- "${theVcpkgPackagesPath}/arm64-osx/include",
- "${theIncludePaths}"
- ],
- "cppStandard": "c++23",
- "intelliSenseMode": "windows-clang-x64"
  }
  // -------------------------------------------------------------------------
+ // TODO: Add Windows (gcc-x64) configuration.
+ // -------------------------------------------------------------------------
  ],
  "version": 4
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -49,6 +49,8 @@
  "python.formatting.provider": "black",
  // ---------------------------------------------------------------------------
  "files.associations": {
+ "*.f90pp": "FortranFreeForm",
+ "*.ipp": "cpp",
  "*.tcc": "cpp",
  "__bit_reference": "cpp",
  "__bits": "cpp",
@@ -69,6 +71,7 @@
  "__verbose_abort": "cpp",
  "algorithm": "cpp",
  "any": "cpp",
+ "armadillo": "cpp",
  "array": "cpp",
  "atomic": "cpp",
  "bit": "cpp",
@@ -99,6 +102,7 @@
  "exception": "cpp",
  "filesystem": "cpp",
  "format": "cpp",
+ "forward_list": "cpp",
  "fstream": "cpp",
  "functional": "cpp",
  "initializer_list": "cpp",
@@ -135,16 +139,20 @@
  "streambuf": "cpp",
  "string": "cpp",
  "string_view": "cpp",
+ "strstream": "cpp",
  "system_error": "cpp",
  "thread": "cpp",
  "tuple": "cpp",
  "type_traits": "cpp",
+ "typeindex": "cpp",
  "typeinfo": "cpp",
  "unordered_map": "cpp",
  "unordered_set": "cpp",
  "utility": "cpp",
+ "valarray": "cpp",
  "variant": "cpp",
- "vector": "cpp"
+ "vector": "cpp",
+ "version": "cpp",
  }
  // ---------------------------------------------------------------------------
 }