CMP0050: make Image module aware of cmake policy

This commit is contained in:
wmayer
2018-08-20 15:52:12 +02:00
parent 1bb8c43203
commit ff2a4978ef
3 changed files with 34 additions and 24 deletions

View File

@@ -33,11 +33,6 @@ add_library(Image SHARED ${Image_SRCS})
target_link_libraries(Image ${Image_LIBS})
fc_target_copy_resource(Image
${CMAKE_SOURCE_DIR}/src/Mod/Image
${CMAKE_BINARY_DIR}/Mod/Image
Init.py)
SET_BIN_DIR(Image Image /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(Image)

View File

@@ -4,18 +4,39 @@ if(BUILD_GUI)
add_subdirectory(Gui)
endif(BUILD_GUI)
set(Image_Scripts
Init.py
)
if(BUILD_GUI)
list (APPEND Image_Scripts InitGui.py)
set(Image_ToolsScripts
ImageTools/__init__.py
ImageTools/_CommandImageScaling.py
)
endif(BUILD_GUI)
add_custom_target(ImageScripts ALL
SOURCES ${Image_Scripts} ${Image_ToolsScripts}
)
fc_target_copy_resource(ImageScripts
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/Mod/Image
${Image_Scripts}
${Image_ToolsScripts}
)
INSTALL(
FILES
Init.py
InitGui.py
${Image_Scripts}
DESTINATION
Mod/Image
)
INSTALL(
FILES
ImageTools/__init__.py
ImageTools/_CommandImageScaling.py
${Image_ToolsScripts}
DESTINATION
Mod/Image/ImageTools
)
)

View File

@@ -88,24 +88,18 @@ else()
)
endif()
add_library(ImageGui SHARED ${ImageGui_SRCS})
target_link_libraries(ImageGui ${ImageGui_LIBS})
fc_target_copy_resource(ImageGui
${CMAKE_SOURCE_DIR}/src/Mod/Image
${CMAKE_BINARY_DIR}/Mod/Image
InitGui.py)
SET_BIN_DIR(ImageGui ImageGui /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(ImageGui)
INSTALL(TARGETS ImageGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
SET(ImageGuiIcon_SVG
Resources/icons/ImageWorkbench.svg
)
add_library(ImageGui SHARED ${ImageGui_SRCS} ${ImageGuiIcon_SVG})
target_link_libraries(ImageGui ${ImageGui_LIBS})
SET_BIN_DIR(ImageGui ImageGui /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(ImageGui)
fc_copy_sources(ImageGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Image" ${ImageGuiIcon_SVG})
INSTALL(TARGETS ImageGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(FILES ${ImageGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Image/Resources/icons")