Force pkg-config to look in the local library folder.

Setting both PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR should
force pkg-config to ignore system installed libraries. We
only want it to find locally compiled dependencies if the
variable OPENSCAD_LIBRARIES is set.

scripts/macosx-build-dependencies.sh

@@ -629,7 +629,6 @@ build_fontconfig 2.11.0
 build_ragel 6.8
 export PATH="$PATH:$DEPLOYDIR/bin"
 create_dummy_cmd "touch gtk-doc.make" "$DEPLOYDIR/bin/gtkdocize"
-create_dummy_cmd "exit 0" "$DEPLOYDIR/bin/pkg-config"
 build_harfbuzz 0.9.23 "--with-coretext=auto --with-glib=no"
 if $OPTION_DEPLOY; then
 #  build_sparkle andymatuschak 0ed83cf9f2eeb425d4fdd141c01a29d843970c20

tests/CMakeLists.txt

@@ -447,7 +447,9 @@ message(STATUS "freetype2 found: ${FREETYPE_VERSION}")
 pkg_search_module(HARFBUZZ REQUIRED harfbuzz>=0.9.19)
 message(STATUS "harfbuzz found: ${HARFBUZZ_VERSION}")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FONTCONFIG_CFLAGS} ${FREETYPE_CFLAGS} ${HARFBUZZ_CFLAGS}")
+add_definitions(${FONTCONFIG_CFLAGS})
+add_definitions(${FREETYPE_CFLAGS})
+add_definitions(${HARFBUZZ_CFLAGS})
 
 # Imagemagick