conan scripts + fix all cmake install

VTX-Molecular-Visualization · Nov 10, 2023 · a8ffbcc · a8ffbcc
1 parent ece60a0
commit a8ffbcc
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 8 deletions.
diff --git a/lib/app/test/CMakeLists.txt b/lib/app/test/CMakeLists.txt
@@ -31,4 +31,4 @@ add_custom_target(vtx_app_test_copy_data ALL COMMAND ${CMAKE_COMMAND} -E copy_di
 add_dependencies(vtx_app_test vtx_app_test_copy_data)
 
 install(TARGETS vtx_app_test)
-install(DIRECTORY data DESTINATION .)
+install(DIRECTORY data DESTINATION bin)
diff --git a/lib/conan_editable_add_all.bat b/lib/conan_editable_add_all.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+conan editable add app
+conan editable add core
+conan editable add io
+conan editable io/chemfiles
+conan editable add python_binding
+conan editable add renderer
+conan editable add tool
+conan editable add ui
+conan editable add util
+PAUSE
diff --git a/lib/conan_editable_remove_all.bat b/lib/conan_editable_remove_all.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+conan editable remove app
+conan editable remove core
+conan editable remove io
+conan editable remove io/chemfiles
+conan editable remove python_binding
+conan editable remove renderer
+conan editable remove tool
+conan editable remove ui
+conan editable remove util
+PAUSE
diff --git a/lib/conan_export_all.bat b/lib/conan_export_all.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+conan export app
+conan export core
+conan export io
+conan export io/chemfiles
+conan export python_binding
+conan export renderer
+conan export tool
+conan export ui
+conan export util
+PAUSE
diff --git a/lib/conan_remove_vtx_all.bat b/lib/conan_remove_vtx_all.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+conan remove vtx* -c
+PAUSE
diff --git a/lib/io/test/CMakeLists.txt b/lib/io/test/CMakeLists.txt
@@ -24,4 +24,4 @@ add_custom_target(vtx_io_test_copy_data ALL COMMAND ${CMAKE_COMMAND} -E copy_dir
 add_dependencies(vtx_io_test vtx_io_test_copy_data)
 
 install(TARGETS vtx_io_test)
-install(DIRECTORY data DESTINATION .)
+install(DIRECTORY data DESTINATION bin)
diff --git a/lib/python_binding/conanfile.py b/lib/python_binding/conanfile.py
@@ -49,7 +49,7 @@ def package_info(self):
         dir_python_script = os.path.join(self.package_folder, "python_script")
         self.conf_info.define("user.myconf:dir_python_script", dir_python_script)
         path_python_module = os.path.join(self.package_folder, "bin", "**", "*.pyd")
-        files = glob.glob(os.path.normpath(self.package_folder + "/**/*.pyd"), recursive=True)
+        files = glob.glob(path_python_module, recursive=True)
         if len(files) > 0:
             print("Found python module: " + files[0])
             self.conf_info.define("user.myconf:path_python_module", files[0])
diff --git a/lib/python_binding/test/CMakeLists.txt b/lib/python_binding/test/CMakeLists.txt
@@ -44,6 +44,6 @@ include(Catch)
 catch_discover_tests(vtx_python_binding_test)
 
 install(TARGETS vtx_python_binding_test)
-install(DIRECTORY ${DIR_PYTHON_SCRIPT} DESTINATION .)
-install(FILES ${PATH_PYTHON_MODULE} DESTINATION PyTX.pyd)
-install(DIRECTORY data DESTINATION .)
+install(DIRECTORY ${DIR_PYTHON_SCRIPT} DESTINATION bin)
+install(FILES ${PATH_PYTHON_MODULE} DESTINATION bin RENAME PyTX.pyd)
+install(DIRECTORY data DESTINATION bin)
diff --git a/lib/renderer/bench/CMakeLists.txt b/lib/renderer/bench/CMakeLists.txt
@@ -35,4 +35,4 @@ add_custom_target(
 add_dependencies(vtx_renderer_bench vtx_renderer_bench_copy_shader)
 
 install(TARGETS vtx_renderer_bench)
-install(DIRECTORY ${DIR_SHADERS} DESTINATION .)
+install(DIRECTORY ${DIR_SHADERS} DESTINATION bin)
diff --git a/lib/ui/test/CMakeLists.txt b/lib/ui/test/CMakeLists.txt
@@ -27,5 +27,5 @@ include(Catch)
 catch_discover_tests(vtx_ui_test)
 
 install(TARGETS vtx_ui_test)
-install(DIRECTORY data DESTINATION .)
+install(DIRECTORY data DESTINATION bin)
 #TODO: install dll too.