Copy instead of copy_if_different. Refs #5192

mantidproject · Aug 17, 2012 · d0b27bb · d0b27bb
1 parent 306f3e9
commit d0b27bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Code/Mantid/Build/CMake/FindCxxTest.cmake b/Code/Mantid/Build/CMake/FindCxxTest.cmake
@@ -132,7 +132,7 @@ macro(CXXTEST_ADD_TEST _cxxtest_testname)
       set (_cxxtest_h_files ${part} ${_cxxtest_h_files})
     endforeach (part ${ARGN})
 
-    get_filename_component( _test_dir ${ARGV1} PATH )
+    set ( _test_dir ${CMAKE_CURRENT_SOURCE_DIR} )
     if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_test_dir}/PrecompiledHeader.h )
       ADD_PRECOMPILED_HEADER( ${_test_dir}/PrecompiledHeader.h ${CMAKE_CURRENT_SOURCE_DIR}/${_test_dir} ${CMAKE_CURRENT_SOURCE_DIR}/${_test_dir}/PrecompiledHeader.cpp _cxxtest_cpp_files _cxxtest_h_files)
     ENDIF ()     

diff --git a/Code/Mantid/Build/CMake/MantidUtils.cmake b/Code/Mantid/Build/CMake/MantidUtils.cmake
@@ -81,9 +81,9 @@ function( COPY_PYTHON_FILES_TO_DIR PY_FILES SRC_DIR DEST_DIR INSTALLED_FILES )
         set( _pyc_bin ${DEST_DIR}/${_basefilename}.pyc )
         add_custom_command ( OUTPUT ${_py_bin} ${_pyc_bin}
                              DEPENDS ${SRC_DIR}/${PYFILE}
-                             COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
+                             COMMAND ${CMAKE_COMMAND} ARGS -E copy
                                ${_py_src} ${_py_bin}
-                             COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
+                             COMMAND ${CMAKE_COMMAND} ARGS -E copy
                                ${_pyc_src} ${_pyc_bin} )
     set ( COPIED_FILES ${COPIED_FILES} ${_py_bin} )
     set ( COPIED_FILES ${COPIED_FILES} ${_pyc_bin} )