Last corrections before 3.5.0 release

Author: FelixPetriconi

recipes/conan_generator/templates/MeVisLabInstallThirdPartyTarget.jinja

@@ -1,7 +1,10 @@
 # {{ name }}
 # {{ header_date }}
 #
-{% set install_excludes = "PATTERN licenses EXCLUDE PATTERN conaninfo.txt EXCLUDE PATTERN conanmanifest.txt EXCLUDE PATTERN lib/python{{python_major_version}}.{{python_minor_version}} EXCLUDE" -%}
+
+{% set exclude_common = "PATTERN conaninfo.txt EXCLUDE PATTERN conanmanifest.txt EXCLUDE PATTERN licenses EXCLUDE PATTERN MeVis" -%}
+{% set exclude_site_packages = "PATTERN site-packages EXCLUDE" -%}
+
 
 {%- if name == 'mesa' %}
 
@@ -11,14 +14,30 @@ endif()
 
 {%- elif name == 'qt5' %}
 
-install(DIRECTORY "{{ rootpath }}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/" USE_SOURCE_PERMISSIONS {{install_excludes}} PATTERN MeVis EXCLUDE)
+install(
+  DIRECTORY "{{ rootpath }}/"
+  DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/"
+  USE_SOURCE_PERMISSIONS
+  {{exclude_common}}
+  {{exclude_site_packages}}
+)
 
 {%- elif name == 'python' %}
 
 if(WIN32)
-  install(DIRECTORY "{{ rootpath }}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/Python" USE_SOURCE_PERMISSIONS PATTERN licenses EXCLUDE PATTERN conaninfo.txt EXCLUDE PATTERN conanmanifest.txt EXCLUDE PATTERN MeVis EXCLUDE)
+  install(
+    DIRECTORY "{{ rootpath }}/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/Python"
+    USE_SOURCE_PERMISSIONS
+    {{exclude_common}}
+  )
 else()
-  install(DIRECTORY "{{ rootpath }}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/Python/{{ build_type | capitalize }}" USE_SOURCE_PERMISSIONS PATTERN licenses EXCLUDE PATTERN conaninfo.txt EXCLUDE PATTERN conanmanifest.txt EXCLUDE PATTERN MeVis EXCLUDE)
+  install(
+    DIRECTORY "{{ rootpath }}/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/Python/{{ build_type | capitalize }}"
+    USE_SOURCE_PERMISSIONS
+    {{exclude_common}}
+  )
 endif()
 
 {% else %}
@@ -27,32 +46,60 @@ endif()
 
 # Copy OpenSSL DLLs so that stand-alone MeVisPython can "import ssl".
 if(WIN32)
-  install(DIRECTORY "{{ rootpath }}/bin/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/Python/DLLs" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*1_1-x64.dll" PATTERN "*1_1-x64d.dll" )
+  install(
+    DIRECTORY "{{ rootpath }}/bin/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/Python/DLLs"
+    USE_SOURCE_PERMISSIONS
+    FILES_MATCHING PATTERN "*1_1-x64.dll" PATTERN "*1_1-x64d.dll"
+  )
 endif()
 
 {% endif %}
 
 {% if bin_paths %}
 foreach(d {{ bin_paths }})
-  install(DIRECTORY "${d}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/bin" USE_SOURCE_PERMISSIONS {{install_excludes}})
+  install(
+    DIRECTORY "${d}/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/bin"
+    USE_SOURCE_PERMISSIONS
+    {{exclude_common}}
+    {{exclude_site_packages}}
+  )
 endforeach()
 {% endif %}
 
 {% if lib_paths %}
 foreach(d {{ lib_paths }})
-  install(DIRECTORY "${d}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/lib" USE_SOURCE_PERMISSIONS {{install_excludes}})
+  install(
+    DIRECTORY "${d}/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/lib"
+    USE_SOURCE_PERMISSIONS
+    {{exclude_common}}
+    {{exclude_site_packages}}
+  )
 endforeach()
 {% endif %}
 
 {% if res_paths %}
 foreach(d {{ res_paths }})
-  install(DIRECTORY "${d}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/res" USE_SOURCE_PERMISSIONS {{install_excludes}})
+  install(DIRECTORY "${d}/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/res"
+    USE_SOURCE_PERMISSIONS
+    {{exclude_common}}
+    {{exclude_site_packages}}
+  )
 endforeach()
 {% endif %}
 
 {% if include_paths %}
 foreach(d {{ include_paths }})
-  install(DIRECTORY "${d}/" DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/include" USE_SOURCE_PERMISSIONS {{install_excludes}})
+  install(
+    DIRECTORY "${d}/"
+    DESTINATION "${MEVISLAB_INSTALL_THIRDPARTYDIR}/include"
+    USE_SOURCE_PERMISSIONS
+    {{exclude_common}}
+    {{exclude_site_packages}}
+  )
 endforeach()
 {% endif %}
 

recipes/conan_generator/templates/PackageConfigTargetType.jinja

@@ -10,7 +10,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/MeVisLabThirdPartyMacros.cmake")
 if(NOT DEFINED MEVISLAB_{{ name }}_ROOTDIR{{build_type_suffix}})
 {% if name == 'Qt5Dummy' %}
     set(MEVISLAB_{{ name }}_ROOTDIR{{build_type_suffix}} "${MEVISLAB_THIRDPARTY_ROOT_DIR}")
-{% elif name == 'python' %}
+{% elif name == 'python' or name == 'numpy' %}
     if(WIN32)
         set(MEVISLAB_{{ name }}_ROOTDIR{{build_type_suffix}} "${MEVISLAB_THIRDPARTY_ROOT_DIR}/Python")
     else()