From 244dcd8b70997e901edf55ea4b98fa6b141f2eb4 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Mon, 17 Aug 2015 11:19:30 -0700 Subject: [PATCH] building dateutil w/o egg Should fix #1486 previous commit shoud fix #1192 --- CMake/cdat_modules/dateutils_external.cmake | 3 ++- CMake/cmake_modules/pipinstaller.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMake/cdat_modules/dateutils_external.cmake b/CMake/cdat_modules/dateutils_external.cmake index d12097fd3b..20b01eb89c 100644 --- a/CMake/cdat_modules/dateutils_external.cmake +++ b/CMake/cdat_modules/dateutils_external.cmake @@ -2,5 +2,6 @@ # create an external project to install MyProxyClient, # and configure and build it set(nm DATEUTILS) - +set(USER_INSTALL_OPTIONS --old-and-unmanageable) include(pipinstaller) +unset(USER_INSTALL_OPTIONS) diff --git a/CMake/cmake_modules/pipinstaller.cmake b/CMake/cmake_modules/pipinstaller.cmake index 34ef1648fe..c0c30474e0 100644 --- a/CMake/cmake_modules/pipinstaller.cmake +++ b/CMake/cmake_modules/pipinstaller.cmake @@ -33,7 +33,7 @@ ExternalProject_Add(${nm} BUILD_IN_SOURCE 1 CONFIGURE_COMMAND "" BUILD_COMMAND "" - INSTALL_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} PYTHONPATH=${PYTHONPATH} ${USR_ENVS} ${PYTHON_EXECUTABLE} setup.py install ${PRFX} + INSTALL_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} PYTHONPATH=${PYTHONPATH} ${USR_ENVS} ${PYTHON_EXECUTABLE} setup.py install ${USER_INSTALL_OPTIONS} ${PRFX} DEPENDS ${${nm}_deps} ${ep_log_options} )