Updated PKG_CONFIG_PATH to locate OpenSSL once built.

ggarra13 · Nov 12, 2023 · 19e32d0 · 19e32d0
1 parent ab57383
commit 19e32d0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,14 +108,22 @@ if(MRV2_PYFLTK AND MRV2_PYBIND11)
     include( cmake/Modules/BuildpyFLTK.cmake )
 endif()
 
-# OpenSSL must be built after Python and pyFLTK or else Python _ssl
-# module fails.
+# OpenSSL must be built before Python and pyFLTK to use the right path when
+# building Python's _ssl module.
 if(TLRENDER_NET AND NOT WIN32)
-    if (BUILD_PYTHON OR MRV2_PYFLTK OR MRV2_PYBIND11)
-	add_dependencies( OpenSSL ${PYTHON_DEP} ${PYBIND11_DEP} ${pyFLTK_DEP})
+    if (BUILD_PYTHON)
+	add_dependencies( Python OpenSSL)
     endif()
 endif()
 
+# # OpenSSL must be built after Python and pyFLTK or else Python _ssl
+# # module fails.
+# if(TLRENDER_NET AND NOT WIN32)
+#     if (BUILD_PYTHON OR MRV2_PYFLTK OR MRV2_PYBIND11)
+# 	add_dependencies( OpenSSL ${PYTHON_DEP} ${PYBIND11_DEP} ${pyFLTK_DEP})
+#     endif()
+# endif()
+
 set( POCO_DEP )
 if( MRV2_NETWORK )
     include( cmake/Modules/BuildPoco.cmake )

diff --git a/cmake/install_whl_files.cmake b/cmake/install_whl_files.cmake
@@ -25,7 +25,7 @@ foreach(whl_file ${whl_files})
     get_filename_component(whl_filename ${whl_file} NAME)
 
     # Install the .whl file to the desired installation location
-    message( STATUS "Running pip install - ${whl_filename} - ..." )
+    message( STATUS "Running ${PYTHON_EXECUTABLE} -m pip install ${whl_filename} --force-reinstall ..." )
     execute_process(
         COMMAND
 	${PYTHON_EXECUTABLE} -m pip install ${whl_filename} --force-reinstall

diff --git a/etc/build_dir.sh b/etc/build_dir.sh
@@ -70,7 +70,7 @@ export OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH="$PWD/${BUILD_DIR}/install/lib64:$PWD/${BUILD_DIR}/install/lib:${LD_LIBRARY_PATH}"
 export OLD_DYLIBRARY_PATH=${DYLD_LIBRARY_PATH}
 export DYLD_LIBRARY_PATH="$PWD/${BUILD_DIR}/install/lib:${DYLD_LIBRARY_PATH}"
-export PKG_CONFIG_PATH="$PWD/${BUILD_DIR}/install/lib/pkgconfig:${PKG_CONFIG_PATH}"
+export PKG_CONFIG_PATH="$PWD/${BUILD_DIR}/install/lib64/pkgconfig:$PWD/${BUILD_DIR}/install/lib/pkgconfig:${PKG_CONFIG_PATH}"
 export PYTHONPATH="$PWD/${BUILD_DIR}/install/lib/python${PYTHON_VERSION}:$PWD/${BUILD_DIR}/install/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}"
 export PYTHONEXE="$PWD/${BUILD_DIR}/install/bin/python${PYTHON_VERSION}"
 if [[ $KERNEL == *Msys* ]]; then