diff --git a/CMakeLists.txt b/CMakeLists.txt index cc9814a..54d1c07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ SOURCE_GROUP( "Generated Files" FILES IF(${USE_QT_VERSION} MATCHES "4") INCLUDE(${QT_USE_FILE}) - ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT_PROJECT -DNO_QT3SUPPORT -DDISABLE_QT3SUPPORT) + ADD_DEFINITIONS(${QT_DEFINITIONS} -DNO_QT3SUPPORT -DDISABLE_QT3SUPPORT -DQT_PROJECT) ELSE() ADD_DEFINITIONS( ${Qt5Widgets_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS} -DQT_PROJECT ) ENDIF() diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 2a9d772..ab4d1a8 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -27,7 +27,7 @@ SET( PONYPROG_CPACK_PACKAGE_HOMEPAGE "http://ponyprog.sourceforge.net/" ) # Setup global packaging parameters ... -SET( PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS "${CURRENT_BUILD_DIR};ponyprogt;ALL;/" ) +SET( PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS "${CURRENT_BUILD_DIR};ponyprog;ALL;/" ) # MESSAGE("PONYPROG_BINARY_DIR ${CURRENT_BUILD_DIR}") # SET( PONYPROG_CPACK_PACKAGE_DESCRIPTION "Ponyprog free GUI for EEPROM and microcontroller flashing." ) SET( PONYPROG_CPACK_PACKAGE_FILE_NAME "ponyprog-setup-${PONYPROG_VERSION}" ) diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt index 9023ab3..bd5fbc7 100644 --- a/distribution/posix/CMakeLists.txt +++ b/distribution/posix/CMakeLists.txt @@ -9,8 +9,8 @@ SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" ) SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" ) INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" DESTINATION bin COMPONENT applications) -INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons" DESTINATION "/usr/share/" FILES_MATCHING PATTERN "*.*") -INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang" DESTINATION "/usr/share/ponyprog/" FILES_MATCHING PATTERN "*.*") +INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons" DESTINATION "/usr/share/" FILES_MATCHING PATTERN "*.png") +INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang" DESTINATION "/usr/share/ponyprog/" FILES_MATCHING PATTERN "*.utf") INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/help" DESTINATION "/usr/share/ponyprog/" FILES_MATCHING PATTERN "*.*") # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")