diff --git a/CMakeLists.txt b/CMakeLists.txt index 80e5b0277d4ab7f4cd5c4407fbdc5714c321959b..74a4994ea275cb7cd5b17bbb469aa345e80cbce6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1504,11 +1504,11 @@ add_custom_target(getHeaders COMMAND ${CMAKE_COMMAND} -E remove_directory Headers COMMAND ${CMAKE_COMMAND} -E make_directory Headers/gmsh WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - foreach(FILE ${GMSH_API}) - add_custom_command(TARGET getHeaders POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy - ${FILE} ${CMAKE_CURRENT_BINARY_DIR}/Headers/gmsh/ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - endforeach(FILE) +foreach(FILE ${GMSH_API}) + add_custom_command(TARGET getHeaders POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy + ${FILE} ${CMAKE_CURRENT_BINARY_DIR}/Headers/gmsh/ + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +endforeach(FILE) find_program(MAKEINFO makeinfo) if(MAKEINFO) diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt index 2897b740c21b563a3d6b3b9bd5c0d7e72604741c..e8de7a174fa1bb50f04cea46715f6c44abafc61d 100644 --- a/contrib/mobile/CMakeLists.txt +++ b/contrib/mobile/CMakeLists.txt @@ -11,7 +11,7 @@ else(APPLE) endif(APPLE) # FIXME: loop over all becnmarks and add those who provide info.xml -set(MODELS machines inductor relay transfo_simple acoustic_scattering) +set(MODELS machines inductor relay acoustic_scattering) foreach(FILE ${MODELS}) find_path(DIR benchmarks/${FILE}) if(FILE) @@ -70,9 +70,6 @@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) cd ${CMAKE_CURRENT_SOURCE_DIR}/utils/ && ${CMAKE_CURRENT_SOURCE_DIR}/utils/make_icon_ios.sh COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/Onelab/ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/Onelab/files - foreach(DIR ${BENCHMARKS}) - COMMAND ${CMAKE_COMMAND} -E copy_directory ${DIR} ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/files/ - endforeach(DIR) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/utils/ios.iconset/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/iOS/Onelab/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/iOS/Onelab.xcodeproj/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab.xcodeproj/ @@ -94,6 +91,11 @@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) COMMAND ${CMAKE_COMMAND} -E copy ${GMSH_FRAMEWORK}/Gmsh ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/Gmsh.framework/ COMMAND ${CMAKE_COMMAND} -E copy ${PETSC_FRAMEWORK}/petsc ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/petsc.framework/ ) + foreach(DIR ${BENCHMARKS}) + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory + ${DIR} ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/files/) + endforeach(DIR) + copy_headers(${GETDP_FRAMEWORK}/Headers/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/GetDP.framework/Headers/) copy_headers(${GMSH_FRAMEWORK}/Headers/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/Gmsh.framework/Headers/) copy_headers(${PETSC_FRAMEWORK}/Headers/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/petsc.framework/Headers/)