diff --git a/.github/workflows/build-game.yml b/.github/workflows/build-game.yml index 5f0677a6f8..eb677588e0 100644 --- a/.github/workflows/build-game.yml +++ b/.github/workflows/build-game.yml @@ -32,7 +32,7 @@ jobs: - name: Build run: | conan install . -b missing -pr:b=tools/conan-profiles/vs-22-release-ninja -pr=tools/conan-profiles/vs-22-release-ninja - cmake --preset conan-release -DBUILD_TEST=ON + cmake --preset conan-release -DBUILD_TEST=ON -DCMAKE_INSTALL_PREFIX=redist ninja - name: Test @@ -121,7 +121,7 @@ jobs: - name: Configure run: | conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja" - cmake --preset conan-release + cmake --preset conan-release -DCMAKE_INSTALL_PREFIX=redist - name: Build run: | @@ -166,7 +166,7 @@ jobs: run: | conan profile detect --force conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja" - cmake --preset conan-release + cmake --preset conan-release -DCMAKE_INSTALL_PREFIX=redist ninja mkdir -p bin/Cytopia.App/Resources/resources cp -pR data/resources bin/Cytopia.App/Contents/Resources/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d07f55031..f721938f17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,9 +86,6 @@ include(CpackConfiguration) # Compile options include(CompileOptions) -# set install dir here for convenience -set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/redist") - message(STATUS "Building Project: ${PROJECT_NAME}") message(STATUS "Build configuration: " ${CMAKE_BUILD_TYPE})