From fc24cad7c9513a54c1a563238dbd3fe07f1268dd Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Wed, 11 Nov 2015 09:19:45 -0800 Subject: [PATCH 01/16] Fix #1539 - Update iPython 3.0.0 to 4.0.0 with dependencies --- CMake/cdat_modules/ipython_deps.cmake | 4 ++-- CMake/cdat_modules/pyexpect_deps.cmake | 1 + CMake/cdat_modules/pyexpect_external.cmake | 14 ++++++++++++++ CMake/cdat_modules/pyexpect_pkg.cmake | 10 ++++++++++ CMake/cdat_modules/traitlets_deps.cmake | 1 + CMake/cdat_modules/traitlets_external.cmake | 14 ++++++++++++++ CMake/cdat_modules/traitlets_pkg.cmake | 10 ++++++++++ 7 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 CMake/cdat_modules/pyexpect_deps.cmake create mode 100644 CMake/cdat_modules/pyexpect_external.cmake create mode 100644 CMake/cdat_modules/pyexpect_pkg.cmake create mode 100644 CMake/cdat_modules/traitlets_deps.cmake create mode 100644 CMake/cdat_modules/traitlets_external.cmake create mode 100644 CMake/cdat_modules/traitlets_pkg.cmake diff --git a/CMake/cdat_modules/ipython_deps.cmake b/CMake/cdat_modules/ipython_deps.cmake index 0828bdbd9..9f5d21ebd 100644 --- a/CMake/cdat_modules/ipython_deps.cmake +++ b/CMake/cdat_modules/ipython_deps.cmake @@ -1,5 +1,5 @@ if (CDAT_BUILD_ALL) - set(IPYTHON_deps ${pip_pkg} ${tornado_pkg} ${numpy_pkg} ${numexpr_pkg}) + set(IPYTHON_deps ${pip_pkg} ${numpy_pkg} ${pyexpect_pkg} ${traitlets_pkg} ${tornado_pkg} ${numexpr_pkg}) else () - set(IPYTHON_deps ${pip_pkg} ${numpy_pkg}) + set(IPYTHON_deps ${pip_pkg} ${numpy_pkg} ${pyexpect_pkg} ${traitlets_pkg}) endif() diff --git a/CMake/cdat_modules/pyexpect_deps.cmake b/CMake/cdat_modules/pyexpect_deps.cmake new file mode 100644 index 000000000..f42b02f7a --- /dev/null +++ b/CMake/cdat_modules/pyexpect_deps.cmake @@ -0,0 +1 @@ +set(Pyexpect_deps ${python_pkg} ${setuptools_pkg}) diff --git a/CMake/cdat_modules/pyexpect_external.cmake b/CMake/cdat_modules/pyexpect_external.cmake new file mode 100644 index 000000000..df58dd33d --- /dev/null +++ b/CMake/cdat_modules/pyexpect_external.cmake @@ -0,0 +1,14 @@ +set(Pyexpect_source "${CMAKE_CURRENT_BINARY_DIR}/build/Pyexpect") + +ExternalProject_Add(Pyexpect + DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR} + SOURCE_DIR ${Pyexpect_source} + URL ${PYEXPECT_URL}/${PYEXPECT_GZ} + URL_MD5 ${PYEXPECT_MD5} + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND "" + BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build + INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX} + DEPENDS ${Pyexpect_deps} + ${ep_log_options} +) diff --git a/CMake/cdat_modules/pyexpect_pkg.cmake b/CMake/cdat_modules/pyexpect_pkg.cmake new file mode 100644 index 000000000..bda625c74 --- /dev/null +++ b/CMake/cdat_modules/pyexpect_pkg.cmake @@ -0,0 +1,10 @@ +set(PYEXPECT_MAJOR 4) +set(PYEXPECT_MINOR 0) +set(PYEXPECT_PATCH 1) +set(PYEXPECT_VERSION ${PYEXPECT_MAJOR}.${PYEXPECT_MINOR}.${PYEXPECT_PATCH}) +set(PYEXPECT_URL ${LLNL_URL} ) +set(PYEXPECT_GZ pyexpect-${PYEXPECT_VERSION}.tar.gz) +set(PYEXPECT_MD5 2bd260f7f2159f9bcab373721736d526) +set(PYEXPECT_SOURCE ${PYEXPECT_URL}/${PYEXPECT_GZ}) + +add_cdat_package(IPYTHON "" "" ON) diff --git a/CMake/cdat_modules/traitlets_deps.cmake b/CMake/cdat_modules/traitlets_deps.cmake new file mode 100644 index 000000000..606d064ec --- /dev/null +++ b/CMake/cdat_modules/traitlets_deps.cmake @@ -0,0 +1 @@ +set(Traitlets_deps ${python_pkg} ${setuptools_pkg}) diff --git a/CMake/cdat_modules/traitlets_external.cmake b/CMake/cdat_modules/traitlets_external.cmake new file mode 100644 index 000000000..bea3b936a --- /dev/null +++ b/CMake/cdat_modules/traitlets_external.cmake @@ -0,0 +1,14 @@ +set(Traitlets_source "${CMAKE_CURRENT_BINARY_DIR}/build/Traitlets") + +ExternalProject_Add(Traitlets + DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR} + SOURCE_DIR ${Traitlets_source} + URL ${TRAITLETS_URL}/${TRAITLETS_GZ} + URL_MD5 ${TRAITLETS_MD5} + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND "" + BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build + INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX} + DEPENDS ${Traitlets_deps} + ${ep_log_options} +) diff --git a/CMake/cdat_modules/traitlets_pkg.cmake b/CMake/cdat_modules/traitlets_pkg.cmake new file mode 100644 index 000000000..d8a994eb0 --- /dev/null +++ b/CMake/cdat_modules/traitlets_pkg.cmake @@ -0,0 +1,10 @@ +set(TRAITLETS_MAJOR 4) +set(TRAITLETS_MINOR 0) +set(TRAITLETS_PATCH 0) +set(TRAITLETS_VERSION ${TRAITLETS_MAJOR}.${TRAITLETS_MINOR}.${TRAITLETS_PATCH}) +set(TRAITLETS_URL ${LLNL_URL} ) +set(TRAITLETS_GZ traitlets-${TRAITLETS_VERSION}.tar.gz) +set(TRAITLETS_MD5 b5b95ea5941fd9619b4704dfd8201568) +set(TRAITLETS_SOURCE ${TRAITLETS_URL}/${TRAITLETS_GZ}) + +add_cdat_package(IPYTHON "" "" ON) -- GitLab From 70e1969bbcf451463f27daeed635b1a0be372f0a Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Wed, 11 Nov 2015 14:15:46 -0800 Subject: [PATCH 02/16] Add test to query availability of ipython --- testing/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index b576bfb95..683b25bb6 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -60,6 +60,9 @@ if (CDAT_BUILD_PCMDI) add_subdirectory(pcmdi) endif() +# Test ipython +add_test(run_ipython ${CMAKE_INSTALL_PREFIX}/bin/ipython -V) + # CMake module tests: # Test that out-of-source build detection is working: add_test(cmake_checkBuildOutOfSource -- GitLab From 1d9c62468f0ea6dfdcc1d3f450919dbfd70d12be Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Wed, 11 Nov 2015 22:05:02 -0800 Subject: [PATCH 03/16] Add pyexpect_pkg and traitlets_pkg to CMakeLists.txt --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74d19ea3a..4e5139c7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -486,6 +486,8 @@ include(zmq_pkg) include(pyzmq_pkg) include(tornado_pkg) include(ipython_pkg) +include(pyexpect_pkg) +include(traitlets_pkg) include(jasper_pkg) include(lapack_pkg) include(lepl_pkg) -- GitLab From 7831caaa3030711721cd861debe7043325e9c4c8 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Thu, 12 Nov 2015 07:38:14 -0800 Subject: [PATCH 04/16] Added back in ipython_pkg.cmake edits --- CMake/cdat_modules/ipython_pkg.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/cdat_modules/ipython_pkg.cmake b/CMake/cdat_modules/ipython_pkg.cmake index ce9193f5c..84b641a1c 100644 --- a/CMake/cdat_modules/ipython_pkg.cmake +++ b/CMake/cdat_modules/ipython_pkg.cmake @@ -1,10 +1,10 @@ -set(IPYTHON_MAJOR 3) +set(IPYTHON_MAJOR 4) set(IPYTHON_MINOR 0) set(IPYTHON_PATCH 0) set(IPYTHON_VERSION ${IPYTHON_MAJOR}.${IPYTHON_MINOR}.${IPYTHON_PATCH}) set(IPYTHON_URL ${LLNL_URL}) set(IPYTHON_GZ ipython-${IPYTHON_VERSION}.tar.gz) -set(IPYTHON_MD5 b3f00f3c0be036fafef3b0b9d663f27e) +set(IPYTHON_MD5 c4f42e52cf9137b7f06f28ee92f39f20) set(IPYTHON_SOURCE ${IPYTHON_URL}/${IPYTHON_GZ}) add_cdat_package(IPYTHON "" "" ON) -- GitLab From c952457c04f34fc621fa1dc505b05f929143b96d Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Thu, 3 Mar 2016 08:55:23 -0800 Subject: [PATCH 05/16] Fix #1539 - Update to latest 4.1.2 release --- CMake/cdat_modules/ipython_pkg.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/cdat_modules/ipython_pkg.cmake b/CMake/cdat_modules/ipython_pkg.cmake index 84b641a1c..fac56dace 100644 --- a/CMake/cdat_modules/ipython_pkg.cmake +++ b/CMake/cdat_modules/ipython_pkg.cmake @@ -1,10 +1,10 @@ set(IPYTHON_MAJOR 4) -set(IPYTHON_MINOR 0) -set(IPYTHON_PATCH 0) +set(IPYTHON_MINOR 1) +set(IPYTHON_PATCH 2) set(IPYTHON_VERSION ${IPYTHON_MAJOR}.${IPYTHON_MINOR}.${IPYTHON_PATCH}) set(IPYTHON_URL ${LLNL_URL}) set(IPYTHON_GZ ipython-${IPYTHON_VERSION}.tar.gz) -set(IPYTHON_MD5 c4f42e52cf9137b7f06f28ee92f39f20) +set(IPYTHON_MD5 6a563c3eddc9a223c3243a38367d9483) set(IPYTHON_SOURCE ${IPYTHON_URL}/${IPYTHON_GZ}) add_cdat_package(IPYTHON "" "" ON) -- GitLab From b4430289a94d88933057fefe0f029b52fdb94aea Mon Sep 17 00:00:00 2001 From: Charles Doutriaux <doutriaux1@llnl.gov> Date: Fri, 4 Mar 2016 11:51:19 -0800 Subject: [PATCH 06/16] typo wrong pkg name --- CMake/cdat_modules/traitlets_pkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/traitlets_pkg.cmake b/CMake/cdat_modules/traitlets_pkg.cmake index d8a994eb0..eab2e7cb6 100644 --- a/CMake/cdat_modules/traitlets_pkg.cmake +++ b/CMake/cdat_modules/traitlets_pkg.cmake @@ -7,4 +7,4 @@ set(TRAITLETS_GZ traitlets-${TRAITLETS_VERSION}.tar.gz) set(TRAITLETS_MD5 b5b95ea5941fd9619b4704dfd8201568) set(TRAITLETS_SOURCE ${TRAITLETS_URL}/${TRAITLETS_GZ}) -add_cdat_package(IPYTHON "" "" ON) +add_cdat_package(Traitlets "" "" ON) -- GitLab From ec5c3ea0f7ed70981a4e7e63578c6f2c92a81322 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Fri, 4 Mar 2016 13:58:47 -0800 Subject: [PATCH 07/16] Correct add_cdat_package magic syntax --- CMake/cdat_modules/pyexpect_pkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/pyexpect_pkg.cmake b/CMake/cdat_modules/pyexpect_pkg.cmake index bda625c74..0d010ea99 100644 --- a/CMake/cdat_modules/pyexpect_pkg.cmake +++ b/CMake/cdat_modules/pyexpect_pkg.cmake @@ -7,4 +7,4 @@ set(PYEXPECT_GZ pyexpect-${PYEXPECT_VERSION}.tar.gz) set(PYEXPECT_MD5 2bd260f7f2159f9bcab373721736d526) set(PYEXPECT_SOURCE ${PYEXPECT_URL}/${PYEXPECT_GZ}) -add_cdat_package(IPYTHON "" "" ON) +add_cdat_package(PYEXPECT "" "" ON) -- GitLab From 85488413dceab3b0d23c2a6e4a1bda4233f65731 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Fri, 4 Mar 2016 13:59:09 -0800 Subject: [PATCH 08/16] Update add_cdat_package caps --- CMake/cdat_modules/traitlets_pkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/traitlets_pkg.cmake b/CMake/cdat_modules/traitlets_pkg.cmake index eab2e7cb6..58883d13f 100644 --- a/CMake/cdat_modules/traitlets_pkg.cmake +++ b/CMake/cdat_modules/traitlets_pkg.cmake @@ -7,4 +7,4 @@ set(TRAITLETS_GZ traitlets-${TRAITLETS_VERSION}.tar.gz) set(TRAITLETS_MD5 b5b95ea5941fd9619b4704dfd8201568) set(TRAITLETS_SOURCE ${TRAITLETS_URL}/${TRAITLETS_GZ}) -add_cdat_package(Traitlets "" "" ON) +add_cdat_package(TRAITLETS "" "" ON) -- GitLab From 9a6bc2cc4992ff2f5df8b0e6d916169cae5ec272 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Fri, 4 Mar 2016 14:21:51 -0800 Subject: [PATCH 09/16] Fix #1539 - Added ipython_genutils dependency --- CMake/cdat_modules/ipython_genutil_external.cmake | 14 ++++++++++++++ CMake/cdat_modules/ipython_genutils_deps.cmake | 1 + CMake/cdat_modules/ipython_genutils_pkg.cmake | 10 ++++++++++ CMakeLists.txt | 1 + 4 files changed, 26 insertions(+) create mode 100644 CMake/cdat_modules/ipython_genutil_external.cmake create mode 100644 CMake/cdat_modules/ipython_genutils_deps.cmake create mode 100644 CMake/cdat_modules/ipython_genutils_pkg.cmake diff --git a/CMake/cdat_modules/ipython_genutil_external.cmake b/CMake/cdat_modules/ipython_genutil_external.cmake new file mode 100644 index 000000000..ec986954b --- /dev/null +++ b/CMake/cdat_modules/ipython_genutil_external.cmake @@ -0,0 +1,14 @@ +set(Ipython_genutils_source "${CMAKE_CURRENT_BINARY_DIR}/build/Ipython_genutils") + +ExternalProject_Add(Ipython_genutils + DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR} + SOURCE_DIR ${Ipython_genutils_source} + URL ${IPYTHON_GENUTILS_URL}/${IPYTHON_GENUTILS_GZ} + URL_MD5 ${IPYTHON_GENUTILS_MD5} + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND "" + BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build + INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX} + DEPENDS ${Ipython_genutils_deps} + ${ep_log_options} +) diff --git a/CMake/cdat_modules/ipython_genutils_deps.cmake b/CMake/cdat_modules/ipython_genutils_deps.cmake new file mode 100644 index 000000000..1f75302a3 --- /dev/null +++ b/CMake/cdat_modules/ipython_genutils_deps.cmake @@ -0,0 +1 @@ +set(Ipython_genutils_deps ${ipython_pkg} ${python_pkg} ${setuptools_pkg}) diff --git a/CMake/cdat_modules/ipython_genutils_pkg.cmake b/CMake/cdat_modules/ipython_genutils_pkg.cmake new file mode 100644 index 000000000..301aa39cb --- /dev/null +++ b/CMake/cdat_modules/ipython_genutils_pkg.cmake @@ -0,0 +1,10 @@ +set(IPYTHON_GENUTILS_MAJOR 0) +set(IPYTHON_GENUTILS_MINOR 1) +set(IPYTHON_GENUTILS_PATCH 0) +set(IPYTHON_GENUTILS_VERSION ${IPYTHON_GENUTILS_MAJOR}.${IPYTHON_GENUTILS_MINOR}.${IPYTHON_GENUTILS_PATCH}) +set(IPYTHON_GENUTILS_URL ${LLNL_URL} ) +set(IPYTHON_GENUTILS_GZ ipython_genutils-${IPYTHON_GENUTILS_VERSION}.zip) +set(IPYTHON_GENUTILS_MD5 9bd368e7294ab372b2f6394504a65653) +set(IPYTHON_GENUTILS_SOURCE ${IPYTHON_GENUTILS_URL}/${IPYTHON_GENUTILS_GZ}) + +add_cdat_package(IPYTHON_GENUTILS "" "" ON) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e5139c7c..eebb4fbc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -486,6 +486,7 @@ include(zmq_pkg) include(pyzmq_pkg) include(tornado_pkg) include(ipython_pkg) +include(ipython_genutils_pkg) include(pyexpect_pkg) include(traitlets_pkg) include(jasper_pkg) -- GitLab From a962e26fe7a96794db157aa18149135806aaee0a Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Fri, 4 Mar 2016 14:23:56 -0800 Subject: [PATCH 10/16] Added ipython_genutils --- CMake/cdat_modules/ipython_deps.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/cdat_modules/ipython_deps.cmake b/CMake/cdat_modules/ipython_deps.cmake index 9f5d21ebd..e1c592f19 100644 --- a/CMake/cdat_modules/ipython_deps.cmake +++ b/CMake/cdat_modules/ipython_deps.cmake @@ -1,5 +1,5 @@ if (CDAT_BUILD_ALL) - set(IPYTHON_deps ${pip_pkg} ${numpy_pkg} ${pyexpect_pkg} ${traitlets_pkg} ${tornado_pkg} ${numexpr_pkg}) + set(IPYTHON_deps ${pip_pkg} ${numpy_pkg} ${pyexpect_pkg} ${traitlets_pkg} ${ipython_genutils_pkg} ${tornado_pkg} ${numexpr_pkg}) else () - set(IPYTHON_deps ${pip_pkg} ${numpy_pkg} ${pyexpect_pkg} ${traitlets_pkg}) + set(IPYTHON_deps ${pip_pkg} ${numpy_pkg} ${pyexpect_pkg} ${traitlets_pkg} ${ipython_genutils_pkg}) endif() -- GitLab From 72f99a2f059e592eed71611345c74a8e057b9be1 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Fri, 4 Mar 2016 16:33:27 -0800 Subject: [PATCH 11/16] Fix #1539 - Corrected ipython_genutil_external.cmake typo --- ...hon_genutil_external.cmake => ipython_genutils_external.cmake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CMake/cdat_modules/{ipython_genutil_external.cmake => ipython_genutils_external.cmake} (100%) diff --git a/CMake/cdat_modules/ipython_genutil_external.cmake b/CMake/cdat_modules/ipython_genutils_external.cmake similarity index 100% rename from CMake/cdat_modules/ipython_genutil_external.cmake rename to CMake/cdat_modules/ipython_genutils_external.cmake -- GitLab From 84cdf676c19b557a7d7f3908136fe8d9f883bbb8 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Fri, 4 Mar 2016 17:16:22 -0800 Subject: [PATCH 12/16] Removing ipython_pkg from dependency list --- CMake/cdat_modules/ipython_genutils_deps.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/ipython_genutils_deps.cmake b/CMake/cdat_modules/ipython_genutils_deps.cmake index 1f75302a3..acd34ee5e 100644 --- a/CMake/cdat_modules/ipython_genutils_deps.cmake +++ b/CMake/cdat_modules/ipython_genutils_deps.cmake @@ -1 +1 @@ -set(Ipython_genutils_deps ${ipython_pkg} ${python_pkg} ${setuptools_pkg}) +set(Ipython_genutils_deps ${python_pkg} ${setuptools_pkg}) -- GitLab From 0e773ddad2e544da19ca9142c07eb2c960e9e804 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Tue, 15 Mar 2016 15:39:52 -0700 Subject: [PATCH 13/16] Whitespace --- CMake/cdat_modules/ipython_genutils_deps.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/CMake/cdat_modules/ipython_genutils_deps.cmake b/CMake/cdat_modules/ipython_genutils_deps.cmake index acd34ee5e..317768f2e 100644 --- a/CMake/cdat_modules/ipython_genutils_deps.cmake +++ b/CMake/cdat_modules/ipython_genutils_deps.cmake @@ -1 +1,2 @@ set(Ipython_genutils_deps ${python_pkg} ${setuptools_pkg}) + \ No newline at end of file -- GitLab From 981cba6c5831985c70fd06b49eba2dfde7868055 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" <durack1@llnl.gov> Date: Tue, 15 Mar 2016 15:40:18 -0700 Subject: [PATCH 14/16] Fix #1539 - Resolve merge conflicts --- CMake/cdat_modules/ipython_genutils_deps.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/CMake/cdat_modules/ipython_genutils_deps.cmake b/CMake/cdat_modules/ipython_genutils_deps.cmake index 317768f2e..acd34ee5e 100644 --- a/CMake/cdat_modules/ipython_genutils_deps.cmake +++ b/CMake/cdat_modules/ipython_genutils_deps.cmake @@ -1,2 +1 @@ set(Ipython_genutils_deps ${python_pkg} ${setuptools_pkg}) - \ No newline at end of file -- GitLab From 6248e157304dcef6a8e2b440450210d3116838d7 Mon Sep 17 00:00:00 2001 From: Aashish Chaudhary <aashish.chaudhary@kitware.com> Date: Wed, 23 Mar 2016 23:51:10 -0400 Subject: [PATCH 15/16] Fixed targets not found --- CMake/cdat_modules/ipython_genutils_external.cmake | 2 +- CMake/cdat_modules/pyexpect_deps.cmake | 2 +- CMake/cdat_modules/pyexpect_external.cmake | 2 +- CMake/cdat_modules/traitlets_external.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMake/cdat_modules/ipython_genutils_external.cmake b/CMake/cdat_modules/ipython_genutils_external.cmake index ec986954b..20f60b9da 100644 --- a/CMake/cdat_modules/ipython_genutils_external.cmake +++ b/CMake/cdat_modules/ipython_genutils_external.cmake @@ -1,6 +1,6 @@ set(Ipython_genutils_source "${CMAKE_CURRENT_BINARY_DIR}/build/Ipython_genutils") -ExternalProject_Add(Ipython_genutils +ExternalProject_Add(IPYTHON_GENUTILS DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR} SOURCE_DIR ${Ipython_genutils_source} URL ${IPYTHON_GENUTILS_URL}/${IPYTHON_GENUTILS_GZ} diff --git a/CMake/cdat_modules/pyexpect_deps.cmake b/CMake/cdat_modules/pyexpect_deps.cmake index f42b02f7a..766d794bf 100644 --- a/CMake/cdat_modules/pyexpect_deps.cmake +++ b/CMake/cdat_modules/pyexpect_deps.cmake @@ -1 +1 @@ -set(Pyexpect_deps ${python_pkg} ${setuptools_pkg}) +set(PYEXPECT_deps ${python_pkg} ${setuptools_pkg}) diff --git a/CMake/cdat_modules/pyexpect_external.cmake b/CMake/cdat_modules/pyexpect_external.cmake index df58dd33d..5ba4fdcb4 100644 --- a/CMake/cdat_modules/pyexpect_external.cmake +++ b/CMake/cdat_modules/pyexpect_external.cmake @@ -1,6 +1,6 @@ set(Pyexpect_source "${CMAKE_CURRENT_BINARY_DIR}/build/Pyexpect") -ExternalProject_Add(Pyexpect +ExternalProject_Add(PYEXPECT DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR} SOURCE_DIR ${Pyexpect_source} URL ${PYEXPECT_URL}/${PYEXPECT_GZ} diff --git a/CMake/cdat_modules/traitlets_external.cmake b/CMake/cdat_modules/traitlets_external.cmake index bea3b936a..55c45f152 100644 --- a/CMake/cdat_modules/traitlets_external.cmake +++ b/CMake/cdat_modules/traitlets_external.cmake @@ -1,6 +1,6 @@ set(Traitlets_source "${CMAKE_CURRENT_BINARY_DIR}/build/Traitlets") -ExternalProject_Add(Traitlets +ExternalProject_Add(TRAITLETS DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR} SOURCE_DIR ${Traitlets_source} URL ${TRAITLETS_URL}/${TRAITLETS_GZ} -- GitLab From a928535452d3f39b9c08316ab8260187a6953856 Mon Sep 17 00:00:00 2001 From: Aashish Chaudhary <aashish.chaudhary@kitware.com> Date: Thu, 24 Mar 2016 15:35:37 -0400 Subject: [PATCH 16/16] Fixed wrong variable used for dependencies --- CMake/cdat_modules/pyexpect_external.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cdat_modules/pyexpect_external.cmake b/CMake/cdat_modules/pyexpect_external.cmake index 5ba4fdcb4..1371aaecf 100644 --- a/CMake/cdat_modules/pyexpect_external.cmake +++ b/CMake/cdat_modules/pyexpect_external.cmake @@ -9,6 +9,6 @@ ExternalProject_Add(PYEXPECT CONFIGURE_COMMAND "" BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install ${PYTHON_EXTRA_PREFIX} - DEPENDS ${Pyexpect_deps} + DEPENDS ${PYEXPECT_deps} ${ep_log_options} ) -- GitLab