diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-02 20:09:37 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-02 20:09:37 +0000 |
| commit | 93d6cd01c4a206f3f3af1a4c8cb5ea55a9b80e74 (patch) | |
| tree | 674154f2725b6fbeaeb437272948623ba65e8404 /src | |
| parent | Added inverse mask and clippath (diff) | |
| parent | do not build grid2 in target all (diff) | |
| download | inkscape-93d6cd01c4a206f3f3af1a4c8cb5ea55a9b80e74.tar.gz inkscape-93d6cd01c4a206f3f3af1a4c8cb5ea55a9b80e74.zip | |
Merge branch 'master' into menuInverseClipMask
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/extension/plugins/grid2/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 72d984845..4c56b211d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -540,7 +540,7 @@ set(INKSCAPE_TARGET_LIBS ) # Build everything except main and inkview.c in a shared library. -add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC}) +add_library(inkscape_base ${inkscape_SRC} ${sp_SRC}) if(WITH_DBUS) add_dependencies(inkscape_base inkscape_dbus) diff --git a/src/extension/plugins/grid2/CMakeLists.txt b/src/extension/plugins/grid2/CMakeLists.txt index f39e259de..eb200e96e 100644 --- a/src/extension/plugins/grid2/CMakeLists.txt +++ b/src/extension/plugins/grid2/CMakeLists.txt @@ -2,7 +2,7 @@ set(grid_PART_SRCS grid.cpp) include_directories( ${CMAKE_BINARY_DIR}/src ) -add_library(grid2 SHARED ${grid_PART_SRCS}) +add_library(grid2 SHARED EXCLUDE_FROM_ALL ${grid_PART_SRCS}) target_link_libraries(grid2 inkscape_base) |