cmake add copy_stdlib and copy_libpyston as check-pyston dependencies and misc cleanup

CMakeLists.txt

@@ -142,8 +142,8 @@ find_package(LibLZMA REQUIRED)
 link_directories(${CMAKE_BINARY_DIR}/libunwind/lib)
 link_directories(${LLVM_LIBRARY_DIRS})
 
-add_subdirectory(lib_python)
 add_subdirectory(lib_pyston)
+add_subdirectory(lib_python)
 add_subdirectory(src)
 add_subdirectory(test/test_extension)
 add_subdirectory(test/unittests)
@@ -154,7 +154,6 @@ add_executable(pyston $<TARGET_OBJECTS:PYSTON_MAIN_OBJECT> $<TARGET_OBJECTS:PYST
 target_link_libraries(pyston -Wl,--whole-archive stdlib -Wl,--no-whole-archive pthread m readline gmp unwind pypa double-conversion ${LLVM_LIBS} ${LIBLZMA_LIBRARIES})
 
 # copy the python standard library (lib_python/2.7) and src/codegen/parse_ast.py to the build directory
-add_custom_command(TARGET pyston POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/lib_python/2.7 ${CMAKE_BINARY_DIR}/lib_python/2.7)
 add_custom_command(TARGET pyston POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/codegen/parse_ast.py ${CMAKE_BINARY_DIR}/src/codegen/parse_ast.py)
 
 add_custom_target(astcompare COMMAND ${CMAKE_SOURCE_DIR}/tools/astprint_test.sh
@@ -180,7 +179,7 @@ add_custom_target(check-format ${CMAKE_SOURCE_DIR}/tools/check_format.sh ${LLVM_
 add_custom_target(lint ${PYTHON_EXE} ${CMAKE_SOURCE_DIR}/tools/lint.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src)
 
 # check
-add_custom_target(check-pyston COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure DEPENDS pyston clang-format ext_cpython ext_pyston unittests) 
+add_custom_target(check-pyston COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure DEPENDS pyston copy_stdlib copy_libpyston clang-format ext_cpython ext_pyston unittests) 
 
 # {run,dbg,perf,memcheck,memleaks,cachegrind}_TESTNAME
 file(GLOB RUNTARGETS ${CMAKE_SOURCE_DIR}/test/tests/*.py ${CMAKE_SOURCE_DIR}/microbenchmarks/*.py ${CMAKE_SOURCE_DIR}/minibenchmarks/*.py)

lib_pyston/CMakeLists.txt

 # Copy any changed lib_pyston sources:
 file(GLOB_RECURSE LIBPYSTON_SRCS . "*.py")
-SET(LIBPYSTON_TARGETS "")
+set(LIBPYSTON_TARGETS "")
 foreach(STDLIB_FILE ${LIBPYSTON_SRCS})
     file(RELATIVE_PATH FN_REL ${CMAKE_SOURCE_DIR} ${STDLIB_FILE})
     set(TARGET ${CMAKE_BINARY_DIR}/${FN_REL})
@@ -13,4 +13,3 @@ foreach(STDLIB_FILE ${LIBPYSTON_SRCS})
     set(LIBPYSTON_TARGETS ${LIBPYSTON_TARGETS} ${TARGET})
 endforeach(STDLIB_FILE)
 add_custom_target(copy_libpyston ALL DEPENDS ${LIBPYSTON_TARGETS})
-

lib_python/CMakeLists.txt

 # Copy any changed stdlib files to the destination:
 file(GLOB_RECURSE STDLIB_SRCS 2.7/ "*.py")
-SET(STDLIB_TARGETS "")
+set(STDLIB_TARGETS "")
 foreach(STDLIB_FILE ${STDLIB_SRCS})
     file(RELATIVE_PATH FN_REL ${CMAKE_SOURCE_DIR} ${STDLIB_FILE})
     set(TARGET ${CMAKE_BINARY_DIR}/${FN_REL})