Fix CI

VTX-Molecular-Visualization · Jul 30, 2024 · 14687e2 · 14687e2
1 parent b0c01a5
commit 14687e2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/cmake_renderer.yml b/.github/workflows/cmake_renderer.yml
@@ -54,6 +54,7 @@ jobs:
         conan upload sdl -r=cano7782
         conan upload imgui -r=cano7782
         conan upload stb -r=cano7782
+        conan upload catch2 -r=cano7782
 
     - name: Read package path from output.json
       id: read_package_path

diff --git a/.github/workflows/cmake_util.yml b/.github/workflows/cmake_util.yml
@@ -49,7 +49,7 @@ jobs:
         conan upload nlohmann_json -r=cano7782
         conan upload magic_enum -r=cano7782
         conan upload cpr -r=cano7782
-        conan upload catch2 -r=cano7782
         conan upload fmt -r=cano7782
         conan upload zlib -r=cano7782
-        conan upload libcurl -r=cano7782
+        conan upload libcurl -r=cano7782
+        conan upload catch2 -r=cano7782
diff --git a/lib/renderer/CMakeLists.txt b/lib/renderer/CMakeLists.txt
@@ -9,7 +9,7 @@ include(CTest)
 include(Catch)
 
 set(_VTX_RENDERER_CONAN " ") # So the right target name can be linked
-include ("${CMAKE_CURRENT_LIST_DIR}/cmake/library.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/library.cmake")
 
 install(TARGETS vtx_renderer vtx_renderer_no_opengl FILE_SET public_headers DESTINATION include)
 install(DIRECTORY shaders DESTINATION .)
diff --git a/lib/renderer/cmake/library.cmake b/lib/renderer/cmake/library.cmake
@@ -6,8 +6,8 @@ configure_target(vtx_renderer)
 
 file(GLOB_RECURSE HEADERS "${CMAKE_CURRENT_LIST_DIR}/../include/*")
 file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_LIST_DIR}/../src/*")
-file(GLOB_RECURSE GLAD_HEADERS "${CMAKE_CURRENT_LIST_DIR}/../vendor/glad/include/*")
-file(GLOB_RECURSE GLAD_SOURCES "${CMAKE_CURRENT_LIST_DIR}/../vendor/glad/src/*")
+#file(GLOB_RECURSE GLAD_HEADERS "${CMAKE_CURRENT_LIST_DIR}/../vendor/glad/include/*")
+#file(GLOB_RECURSE GLAD_SOURCES "${CMAKE_CURRENT_LIST_DIR}/../vendor/glad/src/*")
 file(GLOB_RECURSE SHADERS "${CMAKE_CURRENT_LIST_DIR}/../shaders/*")
 target_sources(vtx_renderer
 	PRIVATE ${SOURCES}

diff --git a/lib/renderer/conanfile.py b/lib/renderer/conanfile.py
@@ -39,11 +39,11 @@ def layout(self):
     def build(self):
         cmake = CMake(self)
         cmake.configure()
-        cmake.build()
-        cmake.ctest(["--output-on-failure"])
+        cmake.build()        
 
     def package(self):
         cmake = CMake(self)
+        cmake.ctest(["--output-on-failure"])
         cmake.install()
         copy(self, "*.cmake", self.build_folder, self.package_folder)
 
@@ -56,8 +56,10 @@ def package_info(self):
         self.cpp_info.components["vtx_renderer_no_opengl"].libs = ["vtx_renderer_no_opengl"]
         self.cpp_info.components["vtx_renderer_no_opengl"].set_property("cmake_target_name", "vtx_renderer::vtx_renderer_no_opengl")
         self.cpp_info.components["vtx_renderer_no_opengl"].requires = ["vtx_util::vtx_util"]
-        #self.cpp_info.components["vtx_renderer_no_opengl"].includedirs = ["include"]
-
+        #self.cpp_info.components["vtx_renderer_no_opengl"].includedirs = ["include"]        
+
+        self.cpp_info.components["vtx_renderer_test"].requires = ["catch2::catch2"]
+
         self.conf_info.define("user.myconf:dir_shaders", os.path.join(self.package_folder, "shaders"))
         self.cpp_info.set_property("cmake_build_modules", ["cmake/copy_shaders.cmake"])
 
diff --git a/lib/util/conanfile.py b/lib/util/conanfile.py
@@ -39,11 +39,11 @@ def generate(self):
     def build(self):
         cmake = CMake(self)
         cmake.configure()
-        cmake.build()
-        cmake.ctest(["--output-on-failure"])
+        cmake.build()        
 
     def package(self):
         cmake = CMake(self)
+        cmake.ctest(["--output-on-failure"])
         cmake.install()
         copy(self, "*.cmake", self.build_folder, self.package_folder)