diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab71979b..ccd228eec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,10 +96,10 @@ MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV SALOME_GEOM_USE_VTK)
 FIND_PACKAGE(SalomePythonInterp REQUIRED)
 FIND_PACKAGE(SalomePythonLibs REQUIRED)
 
-IF (NOT DEFINED EMSCRIPTEN)
-  FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
-  FIND_PACKAGE(SalomeSWIG REQUIRED)
-ELSE()
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
+FIND_PACKAGE(SalomeSWIG REQUIRED)
+
+IF (DEFINED EMSCRIPTEN)
   FIND_PACKAGE(SalomePythonWasm REQUIRED)
   SET(PYTHON_INCLUDE_DIRS ${PYTHONWASM_INCLUDE_DIR})
   SET(PYTHON_LIBRARIES ${PYTHONWASM_LIB})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 10be9de03..942d01d02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,9 +27,9 @@ SET(SUBDIRS_COMMON
   STLPlugin BREPPlugin STEPPlugin IGESPlugin XAOPlugin Tools
   )
 
-if (NOT DEFINED EMSCRIPTEN)
-  list(SUBDIRS_COMMON APPEND XAO_Swig GEOM_SWIG)
-endif()
+# if (NOT DEFINED EMSCRIPTEN)
+list(APPEND SUBDIRS_COMMON XAO_Swig GEOM_SWIG)
+# endif()
 
 ##
 # OPENCV
diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt
index f0ef9737b..28d980260 100644
--- a/src/GEOMImpl/CMakeLists.txt
+++ b/src/GEOMImpl/CMakeLists.txt
@@ -46,7 +46,7 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
-  ${PYTHON_LIBRARIES}
+  # ${PYTHON_LIBRARIES}
   ShHealOper GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede XAO
   ${KERNEL_SALOMELocalTrace}
   )
diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
index 14794abdd..dfda47062 100644
--- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
@@ -56,7 +56,7 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   GEOMBase 
   Material
-  ${PYTHON_LIBRARIES}
+  # ${PYTHON_LIBRARIES}
   )
 
 # --- headers ---
diff --git a/src/XAO_Swig/CMakeLists.txt b/src/XAO_Swig/CMakeLists.txt
index 9eda677e2..96ce3b39c 100644
--- a/src/XAO_Swig/CMakeLists.txt
+++ b/src/XAO_Swig/CMakeLists.txt
@@ -38,7 +38,7 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   XAO
-  ${PYTHON_LIBRARIES}
+  # ${PYTHON_LIBRARIES}
   )
 
 # --- scripts ---