Finalize openvinotoolkit#544 (openvinotoolkit#550)

.gitignore

@@ -33,5 +33,4 @@ CMakeUserPresets.json
 # Python-specific
 *.?env*
 *.pyc
-.env
 __pycache__

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "thirdparty/openvino_tokenizers"]
     path = thirdparty/openvino_tokenizers
     url = https://github.com/openvinotoolkit/openvino_tokenizers.git
-    branch = master

src/python/CMakeLists.txt

@@ -9,21 +9,21 @@ FetchContent_Declare(
     URL_HASH SHA256=bf8f242abd1abcd375d516a7067490fb71abd79519a282d22b6e4d19282185a7
 )
 FetchContent_GetProperties(pybind11)
-if(NOT pybind11_POPULATED)
-    FetchContent_Populate(pybind11)
-    # search for FindPython3.cmake instead of legacy modules
-    set(PYBIND11_FINDPYTHON ON)
-    # the following two calls are required for cross-compilation
-    if(OpenVINODeveloperPackage_DIR)
-        ov_find_python3(REQUIRED)
-        ov_detect_python_module_extension()
+# search for FindPython3.cmake instead of legacy modules
+set(PYBIND11_FINDPYTHON ON)
+# the following two calls are required for cross-compilation
+if(OpenVINODeveloperPackage_DIR)
+    ov_find_python3(REQUIRED)
+    ov_detect_python_module_extension()
+else()
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
     else()
-        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
-            find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
-        else()
-            find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
-        endif()
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
     endif()
+endif()
+if(NOT pybind11_POPULATED)
+    FetchContent_Populate(pybind11)
     add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
 endif()