Merge pull request #24 from tboudreaux/fix/gtest
Added gtest as a subproject
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -62,9 +62,10 @@ subprojects/mfem/
|
||||
subprojects/tetgen/
|
||||
subprojects/yaml-cpp/
|
||||
subprojects/quill/
|
||||
subprojects/googletest-1.15.2/
|
||||
|
||||
.vscode/
|
||||
|
||||
*.log
|
||||
|
||||
output/
|
||||
output/
|
||||
|
||||
16
subprojects/gtest.wrap
Normal file
16
subprojects/gtest.wrap
Normal file
@@ -0,0 +1,16 @@
|
||||
[wrap-file]
|
||||
directory = googletest-1.15.2
|
||||
source_url = https://github.com/google/googletest/archive/refs/tags/v1.15.2.tar.gz
|
||||
source_filename = gtest-1.15.2.tar.gz
|
||||
source_hash = 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926
|
||||
patch_filename = gtest_1.15.2-2_patch.zip
|
||||
patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.15.2-2/get_patch
|
||||
patch_hash = 641a16b33c96cd32a593537bc30eb7d853c5cc361fa1ee96884f0e2fca21e2d3
|
||||
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.15.2-2/gtest-1.15.2.tar.gz
|
||||
wrapdb_version = 1.15.2-2
|
||||
|
||||
[provide]
|
||||
gtest = gtest_dep
|
||||
gtest_main = gtest_main_dep
|
||||
gmock = gmock_dep
|
||||
gmock_main = gmock_main_dep
|
||||
BIN
subprojects/packagecache/gtest-1.15.2.tar.gz
Normal file
BIN
subprojects/packagecache/gtest-1.15.2.tar.gz
Normal file
Binary file not shown.
BIN
subprojects/packagecache/gtest_1.15.2-2_patch.zip
Normal file
BIN
subprojects/packagecache/gtest_1.15.2-2_patch.zip
Normal file
Binary file not shown.
@@ -11,7 +11,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, config_dep],
|
||||
dependencies: [gtest_dep, config_dep, gtest_main],
|
||||
include_directories: include_directories('../../src/config/public'),
|
||||
link_with: libconst, # Link the dobj library
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
|
||||
@@ -11,7 +11,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, const_dep],
|
||||
dependencies: [gtest_dep, const_dep, gtest_main],
|
||||
include_directories: include_directories('../../src/const/public'),
|
||||
link_with: libconst, # Link the dobj library
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
|
||||
@@ -13,7 +13,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: gtest_dep,
|
||||
dependencies: [gtest_dep, gtest_main],
|
||||
include_directories: include_directories('../../src/dobj/public'),
|
||||
link_with: libdobj, # Link the dobj library
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
|
||||
@@ -11,7 +11,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, eos_dep],
|
||||
dependencies: [gtest_dep, eos_dep, gtest_main],
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
)
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, mfem_dep],
|
||||
dependencies: [gtest_dep, mfem_dep, gtest_main],
|
||||
include_directories: include_directories('../../src/meshIO/public'),
|
||||
link_with: libmeshIO, # Link the dobj library
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# Google Test dependency
|
||||
gtest_dep = dependency('gtest', main: true, required : true)
|
||||
gtest_main = dependency('gtest_main', required: true)
|
||||
gtest_nomain_dep = dependency('gtest', main: false, required : true)
|
||||
|
||||
# Subdirectories for unit and integration tests
|
||||
|
||||
@@ -13,7 +13,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, picosha2_dep],
|
||||
dependencies: [gtest_dep, picosha2_dep, gtest_main],
|
||||
include_directories: include_directories('../../src/opatIO/public'),
|
||||
link_with: libopatIO, # Link the dobj library
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
|
||||
@@ -11,7 +11,7 @@ foreach test_file : test_sources
|
||||
test_exe = executable(
|
||||
exe_name,
|
||||
test_file,
|
||||
dependencies: [gtest_dep, probe_dep, mfem_dep, quill_dep],
|
||||
dependencies: [gtest_dep, probe_dep, mfem_dep, quill_dep, gtest_main],
|
||||
install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user