diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-06-05 19:33:55 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-06-05 19:33:55 +0000 |
| commit | 2e40143d6e75d50bf659abddc5c7c25fb1bc2436 (patch) | |
| tree | e2fa747c95569dc3f77fcdfa770b3d404ff065cc /CMakeScripts | |
| parent | Hackfest2019: Rm tautological tests (diff) | |
| parent | Use a flowbox when there are more than two options for font feature settings. (diff) | |
| download | inkscape-2e40143d6e75d50bf659abddc5c7c25fb1bc2436.tar.gz inkscape-2e40143d6e75d50bf659abddc5c7c25fb1bc2436.zip | |
Merge changes
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 10 | ||||
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e1f6ca2b9..e0afe784d 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -211,6 +211,12 @@ else() set(LPE_ENABLE_TEST_EFFECTS OFF) endif() +if(APPLE) + pkg_check_modules(MacIntegration REQUIRED gtk-mac-integration-gtk3) + list(APPEND INKSCAPE_INCS_SYS ${MacIntegration_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${MacIntegration_LDFLAGS}) +endif() + # ---------------------------------------------------------------------------- # CMake's builtin # ---------------------------------------------------------------------------- @@ -278,8 +284,8 @@ if(WITH_OPENMP) if(OPENMP_FOUND) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") list(APPEND INKSCAPE_CXX_FLAGS ${OpenMP_CXX_FLAGS}) - if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode") - set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES") + if(APPLE) + list(APPEND INKSCAPE_LIBS "-lomp") endif() mark_as_advanced(OpenMP_C_FLAGS) mark_as_advanced(OpenMP_CXX_FLAGS) diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 4c5e38731..b6456e533 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -84,6 +84,7 @@ if(WIN32) ${MINGW_BIN}/libpangomm-1.4-[0-9]*.dll
${MINGW_BIN}/libpangowin32-1.0-[0-9]*.dll
${MINGW_BIN}/libpcre-[0-9]*.dll
+ ${MINGW_BIN}/libpdcurses.dll
${MINGW_BIN}/libpixman-1-[0-9]*.dll
${MINGW_BIN}/libplc[0-9]*.dll
${MINGW_BIN}/libplds[0-9]*.dll
@@ -94,7 +95,6 @@ if(WIN32) ${MINGW_BIN}/libpsl-[0-9]*.dll
${MINGW_BIN}/libquadmath-[0-9]*.dll
${MINGW_BIN}/libraqm-[0-9]*.dll
- ${MINGW_BIN}/libreadline[0-9]*.dll
${MINGW_BIN}/librevenge-0.[0-9]*.dll
${MINGW_BIN}/librevenge-stream-0.[0-9]*.dll
${MINGW_BIN}/librsvg-2-[0-9]*.dll
@@ -117,13 +117,13 @@ if(WIN32) ${MINGW_BIN}/libxml2-[0-9]*.dll
${MINGW_BIN}/libxslt-[0-9]*.dll
${MINGW_BIN}/libyaml-0-[0-9]*.dll
+ ${MINGW_BIN}/libzstd.dll
${MINGW_BIN}/nss[0-9]*.dll
${MINGW_BIN}/nssutil[0-9]*.dll
${MINGW_BIN}/smime[0-9]*.dll
${MINGW_BIN}/tcl[0-9]*.dll
${MINGW_BIN}/tk[0-9]*.dll
- ${MINGW_BIN}/zlib1.dll
- ${MINGW_BIN}/libzstd.dll)
+ ${MINGW_BIN}/zlib1.dll)
INSTALL(FILES ${MINGW_LIBS} DESTINATION .)
# There are differences for 64-Bit and 32-Bit build environments.
if(HAVE_MINGW64)
|