diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-09 15:39:55 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-09 15:39:55 (GMT) |
| commit | b308ec270d69ef2981b4c89a55f3549aecc9b603 (patch) | |
| tree | b10d66ac1d71850c6111d9c8bc2669c88dc823c7 /tests | |
| parent | b7bb0071fba79233bcc243e18df4fdb2cea97b17 (diff) | |
| parent | 1221b66edb06e1b4f009b0ce3ebee1fb1651aa4e (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMingw-cross-env.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/CMingw-cross-env.cmake b/tests/CMingw-cross-env.cmake index 186c35e..c2883eb 100644 --- a/tests/CMingw-cross-env.cmake +++ b/tests/CMingw-cross-env.cmake @@ -13,7 +13,6 @@ # the setenv-mingw-xbuild.sh script will set MXEDIR # cd openscad/tests && mkdir build-mingw32 && cd build-mingw32 # # set env variables: -# PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$MXEDIR/usr/i686-pc-mingw32/qt/lib/pkgconfig # OPENSCADPATH=../../libraries # (to find MCAD for some tests) # cmake .. -DCMAKE_TOOLCHAIN_FILE=../CMingw-cross-env.cmake \ # -DMINGW_CROSS_ENV_DIR=$MXEDIR @@ -125,6 +124,10 @@ set(QT_UIC_EXECUTABLE ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-uic) function(mingw_cross_env_find_qt) # called from CMakeLists.txt + set(PKGC_DEST ${MINGW_CROSS_ENV_DIR}/usr/i686-pc-mingw32/lib/pkgconfig) + set(QT_PKGC_SRC ${MINGW_CROSS_ENV_DIR}/usr/i686-pc-mingw32/qt/lib/pkgconfig/) + file(COPY ${QT_PKGC_SRC} DESTINATION ${PKGC_DEST} FILES_MATCHING PATTERN "*.pc") + find_package( PkgConfig ) pkg_check_modules( QTCORE QtCore ) pkg_check_modules( QTGUI QtGui ) |