diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/libnrtype/CMakeLists.txt | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 178f0fdcd..8a2fbbeb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,8 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING # Redirect output files # ----------------------------------------------------------------------------- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for runtime binaries") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for shared libraries") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for static libraries") # ----------------------------------------------------------------------------- # Options 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() |