Fixed Tests, added steps to build the executable

Author: madduci

.gitignore

@@ -1,2 +1,4 @@
 vagrant/packages/*.zip
-vagrant/.vagrant
+vagrant/.vagrant
+test/build
+test/*.json

test/CMakeLists.txt

@@ -1,13 +1,10 @@
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23 FATAL_ERROR)
 
 project(winetest CXX)
 set(PROJECT_VERSION 1.0.0)
 
 add_executable(${PROJECT_NAME} test.cpp)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
 set_target_properties(${MODULE_NAME_TEST} PROPERTIES CXX_STANDARD 17)
 set_target_properties(${MODULE_NAME_TEST} PROPERTIES CXX_STANDARD_REQUIRED ON)
 set_target_properties(${MODULE_NAME_TEST} PROPERTIES CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /GL /Yu")

test/build.bat

@@ -2,5 +2,16 @@
 
 setlocal
 cd /d %~dp0
-conan export . test/wine
-conan install winetest/1.0.0@test/wine --build
+md build
+cd build
+
+REM Perform Conan Setup
+conan export --name winetest ..
+conan install --name winetest --no-remote --output-folder . --build=missing ..
+
+REM Build with CMake
+cmake --preset conan-release ..
+cmake --build --preset conan-release
+
+REM Run the Application
+winetest.exe

test/conanfile.py

@@ -1,4 +1,6 @@
-from conans import ConanFile, tools, CMake
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import copy
 from conans.errors import NotFoundException
 import os
 
@@ -8,23 +10,28 @@ class WineTestConan(ConanFile):
     description = "Test for Wine"
     # topics can get used for searches, GitHub topics, Bintray tags etc. Add here keywords about the library
     topics = ("wine", "test", "msvc")
-    url = ""
-    homepage = ""
+    url = "https://github.com/madduci/docker-msvc-cpp"
+    homepage = "https://github.com/madduci/docker-msvc-cpp"
     author = "Michele Adduci <adduci@tutanota.com>"
-    license = ""  # Indicates license type of the packaged library; please use SPDX Identifiers https://spdx.org/licenses/
+    license = "MIT" 
     exports_sources = ["CMakeLists.txt", "test.cpp"]
-    generators = "cmake"
     short_paths = True
     settings = "os", "arch", "compiler", "build_type"
     # Custom attributes for Bincrafters recipe conventions
     _source_subfolder = "source_subfolder"
     _build_subfolder = "build_subfolder"
 
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.variables["PROJECT_VERSION"] = self.version
+        tc.generate()
+        deps = CMakeDeps(self)
+        deps.generate()
+
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
-        self.run('cmake --build . --target package')
 
     def package(self):
         # If the CMakeLists.txt has a proper install method, the steps below may be redundant

test/run.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker run --rm -it -v $(pwd):/home/wine/.wine/drive_c/project docker-wine-msvc:16.9-2019 ""C:/project/build.bat""
+docker run --rm -it -v $(pwd):/home/wine/.wine/drive_c/project madduci/docker-wine-msvc:17.8-2022 ""C:/project/build.bat""

test/test.cpp

@@ -2,10 +2,10 @@
 
 int main()
 {
-    #ifdef _WIN64
-    std::cout << "Hello from MSVC Wine 64!\n";
-    #else
+#ifdef _WIN64
+  std::cout << "Hello from MSVC Wine 64!\n";
+#else
   std::cout << "Hello from MSVC Wine 32!\n";
 #endif
-    return 0;
+  return 0;
 }