Skip to content

Commit

Permalink
building dateutil w/o egg
Browse files Browse the repository at this point in the history
Should fix #1486
previous commit shoud fix #1192
  • Loading branch information
doutriaux1 authored and sankhesh committed Sep 3, 2015
1 parent 462cf16 commit d6cad04
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CMake/cdat_modules/dateutils_external.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion CMake/cmake_modules/pipinstaller.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down

0 comments on commit d6cad04

Please sign in to comment.