31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1290,11 +1290,6 @@
|
|
check_function_exists(powf HAVE_POWF)
|
|
configure_file(config-powf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-powf.h)
|
|
|
|
-if(WIN32)
|
|
- include(${CMAKE_CURRENT_LIST_DIR}/packaging/windows/installer/ConfigureInstallerNsis.cmake)
|
|
- include(${CMAKE_CURRENT_LIST_DIR}/packaging/windows/msix/ConfigureMsixFiles.cmake)
|
|
-endif()
|
|
-
|
|
message("\nBroken tests:")
|
|
foreach(tst ${KRITA_BROKEN_TESTS})
|
|
message(" * ${tst}")
|
|
--- a/krita/CMakeLists.txt
|
|
+++ b/krita/CMakeLists.txt
|
|
@@ -67,13 +67,6 @@
|
|
ecm_add_app_icon(krafile_dummy_ICONS_SRCS ICONS ${krafile_ICON_SRCS} OUTFILE_BASENAME kritafile)
|
|
add_library(krafile_dummy_obj OBJECT ${krafile_dummy_ICONS_SRCS})
|
|
|
|
- # These icons are used to replace those in the shell extension package.
|
|
- install(
|
|
- FILES
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/krita.ico
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/kritafile.ico
|
|
- DESTINATION ${CMAKE_INSTALL_PREFIX}/installer
|
|
- )
|
|
elseif(APPLE)
|
|
if(${XCODE_VERSION} VERSION_GREATER_EQUAL "26.0")
|
|
set_source_files_properties(${ASSETS_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
|