diff --git a/external/InstallKFParticle.cmake b/external/InstallKFParticle.cmake index a00551892d3ff014f3ab7b731cd7cfa081c3c9c0..a63895adbaab49dcc2fe6e7f097c5cb78213efc8 100644 --- a/external/InstallKFParticle.cmake +++ b/external/InstallKFParticle.cmake @@ -23,7 +23,7 @@ ExternalProject_Add(KFPARTICLE BUILD_BYPRODUCTS ${KFPARTICLE_LIBRARY} LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1 CMAKE_ARGS -G ${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/external/InstallVC.cmake b/external/InstallVC.cmake index 64285b8812009dc66de6c42142e391fcb3b13ef7..af4399be6d59675b572361343e5c3024bb340825 100644 --- a/external/InstallVC.cmake +++ b/external/InstallVC.cmake @@ -8,6 +8,7 @@ set(Vc_LIBNAME "${CMAKE_STATIC_LIBRARY_PREFIX}Vc${CMAKE_STATIC_LIBRARY_SUFFIX}") set(Vc_LIBRARY "${Vc_ROOTDIR}/${_LIBDIR_DEFAULT}/${Vc_LIBNAME}") set(Vc_VERSION f8a18751dcb001c8d9820a6c90a1f605e27ca692) # Hash for tag 1.4.1, Need hash for tests +#set(Vc_VERSION fc2d75d0f23f33c2224d546acb965c535a45454a) # Hash for tag 1.4.2, Need hash for tests set(Vc_SRC_URL "https://github.com/VcDevel/Vc") download_project_if_needed(PROJECT vc_source @@ -35,6 +36,7 @@ ExternalProject_Add(VC -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} +# -DBUILD_TESTING=TRUE INSTALL_COMMAND env DESTDIR=${Vc_DESTDIR} ${CMAKE_COMMAND} --build . --target install )