From bcf5c52d54409a89f9af1cf08e5d369d9e9e0d7f Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Thu, 1 Mar 2018 12:30:35 +0530
Subject: [PATCH] Squashed 'moose-core/' changes from 0b125f6940..d27db9c8e7
d27db9c8e7 Do not use -p switch. its not easy to get required info from all linux-distributions.
e667953634 Fixed message to set in cmake.
git-subtree-dir: moose-core
git-subtree-split: d27db9c8e732a8b7a34f7670a19d16e6ccaa6118
---
CMakeLists.txt | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36f53b7a..03c5542d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,20 +458,11 @@ endif()
if(NOT PYMOOSE_BDIST_DIR)
set(PYMOOSE_BDIST_DIR ${CMAKE_BINARY_DIR}/pymoose_bdist)
endif( )
+
# get platform and arch using python.
find_package( PythonInterp REQUIRED)
-execute_process(
- COMMAND ${PYTHON_EXECUTABLE} -c "import sys;print('%s-%s'%(sys.platform,sys.arch))"
- OUTPUT_VARIABLE PY_PLATFORM_ARCH
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-# If not set, use default.
-if(NOT PY_PLATFORM_ARCH)
- message(PY_PLATFORM_ARCH "linux-x86_64")
-endif( )
-message(STATUS "Building bdist for arch: ${PY_PLATFORM_ARCH}")
add_custom_target( bdist
- COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist -p ${PY_PLATFORM_ARCH} -d ${PYMOOSE_BDIST_DIR}
+ COMMAND ${PYTHON_EXECUTABLE} setup.cmake.py bdist -d ${PYMOOSE_BDIST_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/python
COMMENT "Genearating bdist using setup.cmake.py."
VERBATIM
--
GitLab