Minor tweaks...

Author: Dilawar Singh

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-project(PyMOOSE DESCRIPTION "MOOSE Python Module")
+# Project to build MOOSE's python module.
+project(PyMOOSE)
 
 # cmake related macros.
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

CheckCXXCompiler.cmake

@@ -4,9 +4,8 @@ endif()
 
 ########################### COMPILER MACROS #####################################
 include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG( "-std=c++11" COMPILER_SUPPORTS_CXX11 )
-CHECK_CXX_COMPILER_FLAG( "-std=c++0x" COMPILER_SUPPORTS_CXX0X )
-CHECK_CXX_COMPILER_FLAG( "-Wno-strict-aliasing" COMPILER_WARNS_STRICT_ALIASING )
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11 )
+CHECK_CXX_COMPILER_FLAG("-Wno-strict-aliasing" COMPILER_WARNS_STRICT_ALIASING )
 
 # Turn warning to error: Not all of the options may be supported on all
 # versions of compilers. be careful here.
@@ -22,7 +21,6 @@ elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") OR ("${CMAKE_CXX_COMPI
     add_definitions( -Wno-unused-local-typedef )
 endif()
 
-
 add_definitions(-fPIC)
 if(COMPILER_WARNS_STRICT_ALIASING)
     add_definitions( -Wno-strict-aliasing )
@@ -45,11 +43,9 @@ if(COMPILER_SUPPORTS_CXX11)
         add_definitions( -mllvm -inline-threshold=1000 )
     endif(APPLE)
 else(COMPILER_SUPPORTS_CXX11)
-    add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS -DBOOST_NO_SCOPED_ENUMS )
-    message(FATAL_ERROR "\
-        The compiler ${CMAKE_CXX_COMPILER} is too old. \
-        Please use a compiler which has c++11 support.
-        ")
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} is too old. \n"
+      "Please use a compiler which has c++11 support."
+      )
 endif(COMPILER_SUPPORTS_CXX11)
 
 set(COMPILER_IS_TESTED ON)

pymoose/CMakeLists.txt

@@ -18,17 +18,7 @@ add_definitions(-std=c++11)
 add_definitions(-DUSE_NUMPY)
 add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
 
-# set module extensiton. default is .so. Also check ../python/setup.cmake.py
-execute_process(COMMAND
-    ${PYTHON_EXECUTABLE} -c
-"import importlib.machinery
-print(importlib.machinery.EXTENSION_SUFFIXES[-1])"
-    OUTPUT_VARIABLE PYTHON_SO_EXTENSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(NOT PYTHON_SO_EXTENSION)
-    message(STATUS "Python so ext could not be determined. Using default .so")
-    set(PYTHON_SO_EXTENSION ".so")
-endif()
+set(PYTHON_SO_EXTENSION ".so")
 message(STATUS "Python so extension ${PYTHON_SO_EXTENSION}" )
 
 # TARGET
@@ -124,6 +114,7 @@ set(_platform "CMAKE")
 set(PYMOOSE_BDIST_FILE ${CMAKE_BINARY_DIR}/pymoose-${VERSION_MOOSE}.${_platform}.tar.gz)
 set(PYMOOSE_INSTALL_DIR ${CMAKE_BINARY_DIR}/_pymoose_temp_install)
 file(MAKE_DIRECTORY ${PYMOOSE_INSTALL_DIR})
+
 add_custom_command(TARGET _moose POST_BUILD
   COMMAND ${PYTHON_EXECUTABLE} setup.py build_py  
   COMMAND ${PYTHON_EXECUTABLE} setup.py bdist_dumb --skip-build 
@@ -132,6 +123,14 @@ add_custom_command(TARGET _moose POST_BUILD
   COMMENT "python's binary distribution is saved to ${CMAKE_BINARY_DIR}"
   VERBATIM)
 
+# Copy python tree to BUILD directory. User can set PYTHONPATH to
+# ${CMAKE_BINARY_DIR}/python.
+add_custom_target(copy_python_tree ALL
+  COMMAND ${CMAKE_COMMAND} -E copy_directory 
+    ${CMAKE_SOURCE_DIR}/python ${CMAKE_BINARY_DIR}/python
+  DEPENDS _moose)
+
+
 install(CODE "execute_process(
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_PREFIX} tar xf ${PYMOOSE_BDIST_FILE}
   )"