diff --git a/Manager/CMakeLists.txt b/Manager/CMakeLists.txt index fc5d29d..5931fcd 100644 --- a/Manager/CMakeLists.txt +++ b/Manager/CMakeLists.txt @@ -36,8 +36,7 @@ add_executable(Manager src/main.cpp src/cmdparser.cpp) set_target_properties(Manager PROPERTIES - OUTPUT_NAME AkVCamManager - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALLPATH}") + OUTPUT_NAME AkVCamManager) add_dependencies(Manager VCamIPC PlatformUtils VCamUtils) target_include_directories(Manager PRIVATE ..) diff --git a/appveyor.yml b/appveyor.yml index 0791e2a..138f3bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,6 @@ build: environment: global: PYTHON_VERSION: Python39 - INSTALL_PREFIX: C:/projects/akvirtualcamera/ports/deploy/temp_priv # api key from https://bintray.com/profile/edit # encrypted in https://ci.appveyor.com/tools/encrypt BT_KEY: diff --git a/cmio/Assistant/CMakeLists.txt b/cmio/Assistant/CMakeLists.txt index dfccb27..384d4c3 100644 --- a/cmio/Assistant/CMakeLists.txt +++ b/cmio/Assistant/CMakeLists.txt @@ -32,8 +32,7 @@ add_executable(Assistant src/assistantglobals.h src/main.cpp) set_target_properties(Assistant PROPERTIES - OUTPUT_NAME ${CMIO_PLUGIN_ASSISTANT_NAME} - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALLPATH}") + OUTPUT_NAME ${CMIO_PLUGIN_ASSISTANT_NAME}) add_dependencies(Assistant PlatformUtils VCamUtils) target_include_directories(Assistant PRIVATE .. diff --git a/cmio/VirtualCamera/CMakeLists.txt b/cmio/VirtualCamera/CMakeLists.txt index 0891c8b..dfbd643 100644 --- a/cmio/VirtualCamera/CMakeLists.txt +++ b/cmio/VirtualCamera/CMakeLists.txt @@ -47,10 +47,9 @@ add_library(VirtualCamera SHARED src/queue.h src/stream.cpp src/stream.h) -configure_file(Info.plist.in "${CMAKE_BINARY_DIR}/${CONTENTSPATH}/Info.plist") +configure_file(Info.plist.in Info.plist) set_target_properties(VirtualCamera PROPERTIES OUTPUT_NAME ${CMIO_PLUGIN_NAME} - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${MACBINPATH}" PREFIX "" SUFFIX "") add_dependencies(VirtualCamera VCamIPC PlatformUtils VCamUtils) @@ -80,4 +79,4 @@ target_link_libraries(VirtualCamera VCamIPC ${EXTRA_LIBS}) install(TARGETS VirtualCamera DESTINATION ${MACBINPATH}) -install(FILES "${CMAKE_BINARY_DIR}/${CONTENTSPATH}/Info.plist" DESTINATION ${CONTENTSPATH}) +install(FILES Info.plist DESTINATION ${CONTENTSPATH}) diff --git a/dshow/Assistant/CMakeLists.txt b/dshow/Assistant/CMakeLists.txt index 82782c7..3177897 100644 --- a/dshow/Assistant/CMakeLists.txt +++ b/dshow/Assistant/CMakeLists.txt @@ -31,8 +31,7 @@ add_executable(Assistant src/service.cpp src/service.h) set_target_properties(Assistant PROPERTIES - OUTPUT_NAME ${DSHOW_PLUGIN_ASSISTANT_NAME} - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALLPATH}") + OUTPUT_NAME ${DSHOW_PLUGIN_ASSISTANT_NAME}) add_dependencies(Assistant PlatformUtils VCamUtils) target_include_directories(Assistant PRIVATE .. diff --git a/dshow/VirtualCamera/CMakeLists.txt b/dshow/VirtualCamera/CMakeLists.txt index 6a0534e..e8aa70a 100644 --- a/dshow/VirtualCamera/CMakeLists.txt +++ b/dshow/VirtualCamera/CMakeLists.txt @@ -79,7 +79,6 @@ add_library(VirtualCamera SHARED VirtualCamera.def) set_target_properties(VirtualCamera PROPERTIES OUTPUT_NAME ${DSHOW_PLUGIN_NAME} - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALLPATH}" PREFIX "") add_dependencies(VirtualCamera VCamIPC PlatformUtils VCamUtils) target_compile_definitions(VirtualCamera PRIVATE VIRTUALCAMERA_LIBRARY) diff --git a/ports/ci/appveyor/build.bat b/ports/ci/appveyor/build.bat index 833a013..7307f6b 100755 --- a/ports/ci/appveyor/build.bat +++ b/ports/ci/appveyor/build.bat @@ -16,6 +16,8 @@ REM along with Webcamoid. If not, see . REM REM Web-Site: http://webcamoid.github.io/ +set INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\ports\deploy\temp_priv\data + echo. echo Building x64 virtual camera driver echo. @@ -28,6 +30,7 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw64\bin;C:\msy if "%CMAKE_GENERATOR%" == "MSYS Makefiles" ( cmake ^ -G "%CMAKE_GENERATOR%" ^ + -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ .. cmake --build . @@ -39,6 +42,7 @@ if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" ( cmake ^ -G "%CMAKE_GENERATOR%" ^ -A x64 ^ + -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ .. cmake --build . @@ -59,6 +63,7 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw32\bin;C:\msy if "%CMAKE_GENERATOR%" == "MSYS Makefiles" ( cmake ^ -G "%CMAKE_GENERATOR%" ^ + -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ .. cmake --build . @@ -70,6 +75,7 @@ if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" ( cmake ^ -G "%CMAKE_GENERATOR%" ^ -A Win32 ^ + -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ .. cmake --build . diff --git a/ports/ci/appveyor/deploy.bat b/ports/ci/appveyor/deploy.bat index b15ee78..a851469 100755 --- a/ports/ci/appveyor/deploy.bat +++ b/ports/ci/appveyor/deploy.bat @@ -26,8 +26,16 @@ cd ports/deploy git clone https://github.com/webcamoid/DeployTools.git cd ../.. -set MAKE_PATH=%TOOLSDIR%\bin\%MAKETOOL%.exe -set PATH=%QTDIR%\bin;%TOOLSDIR%\bin;%PATH% set PYTHONPATH=%cd%\ports\deploy\DeployTools +setlocal +if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH% +cd build-x64 +cmake --build . --target install +cd .. +cd build-x86 +cmake --build . --target install +cd .. +endlocal + %PYTHON_PATH%\python.exe ports\deploy\deploy.py diff --git a/ports/ci/travis/build.sh b/ports/ci/travis/build.sh index 2dc2552..a5b4fba 100644 --- a/ports/ci/travis/build.sh +++ b/ports/ci/travis/build.sh @@ -19,6 +19,7 @@ # Web-Site: http://webcamoid.github.io/ BUILDSCRIPT=dockerbuild.sh +INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/ports/deploy/temp_priv/data if [ "${TRAVIS_OS_NAME}" = linux ]; then sudo mount --bind root.x86_64 root.x86_64 @@ -28,13 +29,16 @@ if [ "${TRAVIS_OS_NAME}" = linux ]; then export LC_ALL=C export HOME=$HOME -cd $TRAVIS_BUILD_DIR +cd ${TRAVIS_BUILD_DIR} echo echo "Building x64 virtual camera driver" echo mkdir build-x64 cd build-x64 -x86_64-w64-mingw32-cmake .. +x86_64-w64-mingw32-cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + .. cmake --build . cd .. echo @@ -42,7 +46,10 @@ echo "Building x86 virtual camera driver" echo mkdir build-x86 cd build-x86 -i686-w64-mingw32-cmake .. +i686-w64-mingw32-cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + .. cmake --build . EOF chmod +x ${BUILDSCRIPT} @@ -61,6 +68,9 @@ EOF elif [ "${TRAVIS_OS_NAME}" = osx ]; then mkdir build cd build - cmake .. + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + .. cmake --build . fi diff --git a/ports/ci/travis/deploy.sh b/ports/ci/travis/deploy.sh index d05a976..b2abf8e 100644 --- a/ports/ci/travis/deploy.sh +++ b/ports/ci/travis/deploy.sh @@ -50,6 +50,12 @@ EOF fi cat << EOF >> ${DEPLOYSCRIPT} +cd build-x64 +cmake --build . --target install +cd .. +cd build-x86 +cmake --build . --target install +cd .. python ports/deploy/deploy.py EOF chmod +x ${DEPLOYSCRIPT} @@ -59,6 +65,10 @@ EOF sudo umount root.x86_64/$HOME sudo umount root.x86_64 elif [ "${TRAVIS_OS_NAME}" = osx ]; then + cd build + cmake --build . --target install + cd .. + export PYTHONPATH="${PWD}/ports/deploy/DeployTools" python3 ports/deploy/deploy.py fi