summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2017-11-02 18:20:46 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2017-11-02 18:20:46 +0000
commit4e991ba74afefc4595c748a9435fc5a07f1c67d4 (patch)
tree8a98709ad3b6bff1dd81ca0a4ac20b99b6d07b08
parentMake shared library building an option (diff)
downloadinkscape-4e991ba74afefc4595c748a9435fc5a07f1c67d4.tar.gz
inkscape-4e991ba74afefc4595c748a9435fc5a07f1c67d4.zip
do not build grid2 in target all
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/extension/plugins/grid2/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09519c8ac..a1a68d4e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,7 @@ add_definitions(-DORBIT2=1)
add_definitions(-DHAVE_CONFIG_H)
add_definitions(-DHAVE_CAIRO_PDF=1) # needed for src/libnrtype/Layout-TNG.h
add_definitions(-DHAVE_TR1_UNORDERED_SET) # XXX make an option!
-if(NOT WIN32)
+if(BUILD_SHARED_LIBS AND NOT WIN32)
add_definitions(-fPIC)
endif()
#
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)