cmake: Add cross tests

14 files changed, 35 insertions, 7 deletions

diff --git a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
index c9b2a208f..7fce89e25 100644
--- a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
@@ -25,4 +25,4 @@ target_link_libraries(testEXE cmModLib)
 
 target_compile_definitions(cmModLibStatic PUBLIC CMMODLIB_STATIC_DEFINE)
 
-install(TARGETS cmModLib testEXE LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
+install(TARGETS testEXE LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
diff --git a/test cases/cmake/2 advanced/test.json b/test cases/cmake/2 advanced/test.json
index ff3d5a73d..e2d9c051f 100644
--- a/test cases/cmake/2 advanced/test.json
+++ b/test cases/cmake/2 advanced/test.json
@@ -1,7 +1,5 @@
 {
   "installed": [
-    {"type": "expr", "file": "usr/?lib/libcm_cmModLib?so"},
-    {"type": "implib", "file": "usr/lib/libcm_cmModLib"},
     {"type": "exe", "file": "usr/bin/cm_testEXE"}
   ],
   "tools": {
diff --git a/test cases/cmake/211 cmake module/cmake_project/CMakeLists.txt b/test cases/cmake/22 cmake module/cmake_project/CMakeLists.txt
index cd915846a..cd915846a 100644
--- a/test cases/cmake/211 cmake module/cmake_project/CMakeLists.txt
+++ b/test cases/cmake/22 cmake module/cmake_project/CMakeLists.txt
diff --git a/test cases/cmake/211 cmake module/meson.build b/test cases/cmake/22 cmake module/meson.build
index 68f9993a6..68f9993a6 100644
--- a/test cases/cmake/211 cmake module/meson.build
+++ b/test cases/cmake/22 cmake module/meson.build
diff --git a/test cases/cmake/211 cmake module/projectConfig.cmake.in b/test cases/cmake/22 cmake module/projectConfig.cmake.in
index fa3dfca0f..fa3dfca0f 100644
--- a/test cases/cmake/211 cmake module/projectConfig.cmake.in
+++ b/test cases/cmake/22 cmake module/projectConfig.cmake.in
diff --git a/test cases/cmake/211 cmake module/test.json b/test cases/cmake/22 cmake module/test.json
index 2a5625a64..2a5625a64 100644
--- a/test cases/cmake/211 cmake module/test.json
+++ b/test cases/cmake/22 cmake module/test.json
diff --git a/test cases/cmake/23 cmake toolchain/CMakeToolchain.cmake b/test cases/cmake/23 cmake toolchain/CMakeToolchain.cmake
new file mode 100644
index 000000000..ab5fbace1
--- /dev/null
+++ b/test cases/cmake/23 cmake toolchain/CMakeToolchain.cmake
@@ -0,0 +1 @@
+set(MESON_TEST_VAR2 VAR2)
diff --git a/test cases/cmake/23 cmake toolchain/meson.build b/test cases/cmake/23 cmake toolchain/meson.build
new file mode 100644
index 000000000..98f8d21df
--- /dev/null
+++ b/test cases/cmake/23 cmake toolchain/meson.build
@@ -0,0 +1,9 @@
+project('cmake toolchain test', ['c', 'cpp'])
+
+if meson.is_cross_build()
+  error('MESON_SKIP_TEST: skip this on cross builds')
+endif
+
+cm = import('cmake')
+
+sub_pro = cm.subproject('cmMod')
diff --git a/test cases/cmake/23 cmake toolchain/nativefile.ini.in b/test cases/cmake/23 cmake toolchain/nativefile.ini.in
new file mode 100644
index 000000000..2cd6e947a
--- /dev/null
+++ b/test cases/cmake/23 cmake toolchain/nativefile.ini.in
@@ -0,0 +1,8 @@
+[properties]
+
+cmake_toolchain_file = '@MESON_TEST_ROOT@/CMakeToolchain.cmake'
+
+[cmake]
+
+MESON_TEST_VAR1 = 'VAR1 space'
+MESON_TEST_VAR2 = 'VAR2 error'
diff --git a/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt
new file mode 100644
index 000000000..8aeabc2a2
--- /dev/null
+++ b/test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(cmMod)
+
+if(NOT "${MESON_TEST_VAR1}" STREQUAL "VAR1 space")
+  message(FATAL_ERROR "MESON_TEST_VAR1 -- '${MESON_TEST_VAR1}' != 'VAR1 space'")
+endif()
+
+if(NOT "${MESON_TEST_VAR2}" STREQUAL "VAR2")
+  message(FATAL_ERROR "MESON_TEST_VAR2 -- '${MESON_TEST_VAR2}' != 'VAR2'")
+endif()
diff --git a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
index 4c782cb38..026d4c103 100644
--- a/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
+++ b/test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
@@ -23,4 +23,4 @@ target_link_libraries(testEXE2 cmModLib)
 
 target_compile_definitions(cmModLibStatic PUBLIC CMMODLIB_STATIC_DEFINE)
 
-install(TARGETS cmModLib testEXE testEXE2 LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
+install(TARGETS testEXE testEXE2 LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
diff --git a/test cases/cmake/3 advanced no dep/test.json b/test cases/cmake/3 advanced no dep/test.json
index af25a8ec6..4b266c320 100644
--- a/test cases/cmake/3 advanced no dep/test.json
+++ b/test cases/cmake/3 advanced no dep/test.json
@@ -1,8 +1,5 @@
 {
   "installed": [
-    {"type": "expr", "file": "usr/?lib/libcm_cmModLib?so"},
-    {"type": "implib", "file": "usr/lib/libcm_cmModLib"},
-    {"type": "pdb", "file": "usr/bin/cm_cmModLib"},
     {"type": "pdb", "file": "usr/bin/cm_testEXE"},
     {"type": "exe", "file": "usr/bin/cm_testEXE"},
     {"type": "pdb", "file": "usr/bin/cm_testEXE2"},
diff --git a/test cases/cmake/4 code gen/subprojects/cmCodeGen/CMakeLists.txt b/test cases/cmake/4 code gen/subprojects/cmCodeGen/CMakeLists.txt
index 268743c73..ff50e54d5 100644
--- a/test cases/cmake/4 code gen/subprojects/cmCodeGen/CMakeLists.txt
+++ b/test cases/cmake/4 code gen/subprojects/cmCodeGen/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.7)
 
+project(CMCodeGen)
 set(CMAKE_CXX_STANDARD 14)
 
 add_executable(genA main.cpp)
diff --git a/test cases/cmake/7 cmake options/test.json b/test cases/cmake/7 cmake options/test.json
index 046e2ee4c..f9f0b05a7 100644
--- a/test cases/cmake/7 cmake options/test.json
+++ b/test cases/cmake/7 cmake options/test.json
@@ -3,6 +3,9 @@
     "options": {
       "cmake_prefix_path": [
         { "val": ["val1", "val2"] }
+      ],
+      "build.cmake_prefix_path": [
+        { "val": ["val1", "val2"] }
       ]
     }
   }