Merge remote-tracking branch 'origin/master' into pybind11

Author: arahlin

cmake/G3Test.h

@@ -9,6 +9,9 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#ifdef USE_PYTHON
+#include <pybindings.h>
+#endif
 
 #define STRINGIZE(s) STRINGIZE_DIRECT(s)
 #define STRINGIZE_DIRECT(s) #s
@@ -142,7 +145,7 @@ G3Test::testEquivalence(__FILE__, __LINE__, left, right, STRINGIZE(left), STRING
 /// other catch block.
 #ifdef USE_PYTHON
 #define G3TEST_CATCH_PYTHON_ERROR \
-catch(const pybind11::error_already_set& ex){ \
+catch(const py::error_already_set& ex){ \
 	PyErr_Print(); \
 }
 #else

cmake/Spt3gIncludes.cmake

@@ -28,6 +28,14 @@ endmacro(add_spt3g_program prog_name)
 
 macro(add_spt3g_executable prog_name)
 	add_executable(${prog_name} ${ARGN})
+	if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		# Assume Linux-style ld linker
+		if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
+			target_link_options(${prog_name} PUBLIC "LINKER:--no-as-needed")
+		else()
+			set_target_properties(${prog_name} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")
+		endif()
+	endif()
 	target_link_libraries(${prog_name} pybind11::embed)
 endmacro(add_spt3g_executable prog_name)