Skip to content

esmp install broken #981

@doutriaux1

Description

@doutriaux1

Somehow ESMP_Config.py is now wrong.

It should be:

ESMFMKFILE = "../../../../../Externals/lib/libO/Linux.gfortran.64.mpiuni.default/esmf.mk"

But it is only:

ESMFMKFILE = "../../Externals/lib/libO/Linux.gfortran.64.mpiuni.default/esmf.mk"

Seems to have been introduced by commit 71421b7

Looking at the commit's diff I see:

diff --git a/CMake/cdat_modules/python_pkg.cmake b/CMake/cdat_modules/python_pkg.cmake
index 983ce46..680cd29 100644
--- a/CMake/cdat_modules/python_pkg.cmake
+++ b/CMake/cdat_modules/python_pkg.cmake
@@ -13,36 +13,37 @@ add_cdat_package(Python ${PYTHON_MAJOR_SRC}.${PYTHON_MINOR_SRC}.${PYTHON_PATCH_S
 # FIXME: Name style
 set(CDAT_OS_XTRA_PATH "")

-set(PYTHON_SITE_PACKAGES ${CMAKE_INSTALL_PREFIX})
+set(PYTHON_SITE_PACKAGES_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(PYTHON_SITE_PACKAGES ${PYTHON_SITE_PACKAGES_PREFIX}/lib/python${PYVER}/site-packages)

Notice how SITE_PACKAGES seems longer now

and then later


diff --git a/CMake/cdat_modules_extra/ESMP_install_step.cmake.in b/CMake/cdat_modules_extra/ESMP_install_step.cmake.in
index 1084e52..2b8c288 100644
--- a/CMake/cdat_modules_extra/ESMP_install_step.cmake.in
+++ b/CMake/cdat_modules_extra/ESMP_install_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)

 file(GLOB_RECURSE ESMP_esmfmkfile "@cdat_EXTERNALS@/lib/libO/*.mk")
-file(RELATIVE_PATH _rel_path @PYTHON_SITE_PACKAGES@/ESMP/src ${ESMP_esmfmkfile})
+file(RELATIVE_PATH _rel_path @PYTHON_SITE_PACKGES_PREFIX@/ESMP/src ${ESMP_esmfmkfile})

typo here but it doesn't seem to fix the problem..

I guess the issue is why a REL_PATH here? Can't we hard code this?

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions