diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-01-09 20:14:18 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-01-09 20:14:18 +0000 |
| commit | 4179f339b19c3234f60dccda5b69d5d5186cb0fb (patch) | |
| tree | f802a8ac1633507376f8f4ec9763e461f5b2b1e1 /src | |
| parent | Fix sensitivity for arc toolbar controls. (diff) | |
| download | inkscape-4179f339b19c3234f60dccda5b69d5d5186cb0fb.tar.gz inkscape-4179f339b19c3234f60dccda5b69d5d5186cb0fb.zip | |
Fix static build
(failed on Windows)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/libnrtype/CMakeLists.txt | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6ef78a4f..de5419de8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -572,5 +572,6 @@ else() inkscape_com inkview inkview_com - RUNTIME DESTINATION .) + RUNTIME DESTINATION . + ARCHIVE DESTINATION .) endif() diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt index ab18ce89e..c39eecbbc 100644 --- a/src/libnrtype/CMakeLists.txt +++ b/src/libnrtype/CMakeLists.txt @@ -22,3 +22,9 @@ set(nrtype_SRC ) add_inkscape_lib(nrtype_LIB "${nrtype_SRC}") + +# we have circular references between nrtype_LIB and inkscape_base! +# this workaround prevents undefined references in nrtype_LIB when building static libraries (likely link order problem) +if(NOT BUILD_SHARED_LIBS) + target_link_libraries(nrtype_LIB inkscape_base) +endif() |