mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Support CMake+Ninja in SuperBuild 

* Use CMake-native call to `ProcessorCount` instead of a shell execute
  call to `nproc` that only works in Makefile-style builds.
* Use CMake's implicit default `cmake --build` commands to build CMake
  projects instead of assuming `make`.

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
pull/1167/head
Daniel Llewellyn 2020-10-15 14:16:35 +01:00 zatwierdzone przez Daniel Llewellyn
rodzic a1d4cd5ba8
commit 21a4d51504
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 5C7C5EBA43A55951
1 zmienionych plików z 6 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
SuperBuild/CMakeLists.txt
Wyświetl plik

@ -125,6 +125,9 @@ foreach(lib ${custom_libs})
SETUP_EXTERNAL_PROJECT_CUSTOM(${lib}) SETUP_EXTERNAL_PROJECT_CUSTOM(${lib})
endforeach() endforeach()
include(ProcessorCount)
ProcessorCount(nproc)
## Add mve Build ## Add mve Build
externalproject_add(mve externalproject_add(mve
@ -134,7 +137,7 @@ externalproject_add(mve
SOURCE_DIR ${SB_SOURCE_DIR}/elibs/mve SOURCE_DIR ${SB_SOURCE_DIR}/elibs/mve
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make BUILD_COMMAND make -j${nproc}
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
@ -145,7 +148,7 @@ externalproject_add(poissonrecon
UPDATE_COMMAND "" UPDATE_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make poissonrecon BUILD_COMMAND make -j${nproc} poissonrecon
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
@ -155,7 +158,6 @@ externalproject_add(dem2mesh
SOURCE_DIR ${SB_SOURCE_DIR}/dem2mesh SOURCE_DIR ${SB_SOURCE_DIR}/dem2mesh
UPDATE_COMMAND "" UPDATE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
@ -165,7 +167,6 @@ externalproject_add(dem2points
SOURCE_DIR ${SB_SOURCE_DIR}/dem2points SOURCE_DIR ${SB_SOURCE_DIR}/dem2points
UPDATE_COMMAND "" UPDATE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
@ -178,6 +179,6 @@ externalproject_add(lastools
CMAKE_GENERATOR "" CMAKE_GENERATOR ""
UPDATE_COMMAND "" UPDATE_COMMAND ""
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND make -C LASlib -j$(nproc) CXXFLAGS='-std=c++11' && make -C src -j$(nproc) CXXFLAGS='-std=c++11' lasmerge BUILD_COMMAND make -C LASlib -j${nproc} CXXFLAGS='-std=c++11' && make -C src -j${nproc} CXXFLAGS='-std=c++11' lasmerge
INSTALL_COMMAND mv ${SB_SOURCE_DIR}/lastools/bin/lasmerge ${SB_INSTALL_DIR}/bin INSTALL_COMMAND mv ${SB_SOURCE_DIR}/lastools/bin/lasmerge ${SB_INSTALL_DIR}/bin
) )