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]>
gaia-platform · May 23, 2020 · b88c306 · b88c306
1 parent acdee42
commit b88c306
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/demos/incubator/main.cpp b/demos/incubator/main.cpp
@@ -263,7 +263,7 @@ int main(int argc, const char **argv) {
                     simulation_thread[0].join();
                     printf("Simulation stopped...\n");
                 } else {
-                    printf("Simulatin is not started.\n");
+                    printf("Simulation is not started.\n");
                 }
                 break;
             case 'l':

diff --git a/production/CMakeLists.txt b/production/CMakeLists.txt
@@ -39,6 +39,17 @@ set(GAIA_PROD_BUILD "${CMAKE_BINARY_DIR}")
 message(STATUS "GAIA_INC=${GAIA_INC}")
 
 find_package(Python3 COMPONENTS Interpreter Development)
+if (NOT Python3_FOUND)
+  # Work with CMAKE 3.11 python find package.  Looks like FindPython3
+  # FindPython2 or FindPython work with CMAKE 3.12 and above.
+  find_package(PythonInterp 3)
+  find_package(PythonLibs 3)
+  if (PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND)
+    set(Python3_FOUND TRUE)
+    set(Python3_EXECUTABLE "${PYTHON_EXECUTABLE}")
+  endif()
+endif()
+
 find_package(Java)
 find_package(JNI)
 

diff --git a/scratch/gregory/cameraDemo/packaging/Dockerfile b/scratch/gregory/cameraDemo/packaging/Dockerfile
@@ -92,7 +92,9 @@ RUN wget -O ${APP_RUN} https://github.com/AppImage/AppImageKit/releases/download
 # Install Gaia Platform production build dependencies.
 RUN apt-get install -y \
         clang-8 \
-        pybind11-dev
+        python3-pip
+
+RUN pip3 install pybind11
 
 # Build Gaia Platform production.
 COPY /production /GaiaPlatform/production