Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CMake] Updated CMake script to change layout of build files. #1224

Merged
merged 1 commit into from Mar 12, 2020
Merged

[CMake] Updated CMake script to change layout of build files. #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -241,3 +241,9 @@ synfig-studio/doc
/ETL/nbproject/
/synfig-core/nbproject/
/synfig-studio/nbproject/

# ------------------------------------------------------------------------
# CLion projects
# ------------------------------------------------------------------------
/.idea
ice0 marked this conversation as resolved.
Show resolved Hide resolved
cmake-build-*
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 2.8)

project(synfig-studio)

set(SYNFIG_BUILD_ROOT ${CMAKE_BINARY_DIR}/output)

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SYNFIG_BUILD_ROOT}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SYNFIG_BUILD_ROOT}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SYNFIG_BUILD_ROOT}/bin)

add_subdirectory(ETL)
include_directories(ETL)
include_directories(${PROJECT_BINARY_DIR}/ETL) # to find the generated etl_profile.h
Expand Down
3 changes: 3 additions & 0 deletions synfig-core/src/modules/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -43,6 +43,9 @@ set(MODS_ENABLED
# mptr_mplayer # - "This code has vulnerabilities"
)

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SYNFIG_BUILD_ROOT}/lib/synfig/modules)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SYNFIG_BUILD_ROOT}/lib/synfig/modules)

## Magick++ support
option(WITH_MAGICPP "Enable Magic++ module (output format support)" OFF)
option(WITHOUT_MAGICPP "Disable Magic++ module (output format support)" OFF)
Expand Down