Skip to content

Commit b88c306

Browse files
daxhawCameron Evans
andauthored
Final fixes for Q1 tag (#90)
* Fix typo in incubator demo help text * Find python3 if only cmake 3.11 is installed * Fix cameraDemo packaging pybind11 dependency Install from pip instead of apt to get the required pybind11 >= 2.2. Co-authored-by: Cameron Evans <[email protected]>
1 parent acdee42 commit b88c306

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

demos/incubator/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ int main(int argc, const char **argv) {
263263
simulation_thread[0].join();
264264
printf("Simulation stopped...\n");
265265
} else {
266-
printf("Simulatin is not started.\n");
266+
printf("Simulation is not started.\n");
267267
}
268268
break;
269269
case 'l':

production/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ set(GAIA_PROD_BUILD "${CMAKE_BINARY_DIR}")
3939
message(STATUS "GAIA_INC=${GAIA_INC}")
4040

4141
find_package(Python3 COMPONENTS Interpreter Development)
42+
if (NOT Python3_FOUND)
43+
# Work with CMAKE 3.11 python find package. Looks like FindPython3
44+
# FindPython2 or FindPython work with CMAKE 3.12 and above.
45+
find_package(PythonInterp 3)
46+
find_package(PythonLibs 3)
47+
if (PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND)
48+
set(Python3_FOUND TRUE)
49+
set(Python3_EXECUTABLE "${PYTHON_EXECUTABLE}")
50+
endif()
51+
endif()
52+
4253
find_package(Java)
4354
find_package(JNI)
4455

scratch/gregory/cameraDemo/packaging/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ RUN wget -O ${APP_RUN} https://github.com/AppImage/AppImageKit/releases/download
9292
# Install Gaia Platform production build dependencies.
9393
RUN apt-get install -y \
9494
clang-8 \
95-
pybind11-dev
95+
python3-pip
96+
97+
RUN pip3 install pybind11
9698

9799
# Build Gaia Platform production.
98100
COPY /production /GaiaPlatform/production

0 commit comments

Comments
 (0)