alenka/ponyprog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake small bugfixes

Browse Source 
(cherry picked from commit 122d8cac8583ba4b47187fc04b0f6f3f79726fa0)
This commit is contained in:
Eduard Kalinowski 2017-05-01 21:50:03 +02:00 committed by Claudio Lanconelli
parent b952d1e2aa
commit 0a87f7241d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -221,7 +221,7 @@ SOURCE_GROUP( "Generated Files" FILES
IF(${USE_QT_VERSION} MATCHES "4") IF(${USE_QT_VERSION} MATCHES "4")
INCLUDE(${QT_USE_FILE}) 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() ELSE()
ADD_DEFINITIONS( ${Qt5Widgets_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS} -DQT_PROJECT ) ADD_DEFINITIONS( ${Qt5Widgets_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS} -DQT_PROJECT )
ENDIF() ENDIF()

2
distribution/CMakeLists.txt
View File

@ -27,7 +27,7 @@ SET( PONYPROG_CPACK_PACKAGE_HOMEPAGE "http://ponyprog.sourceforge.net/" )
# Setup global packaging parameters ... # 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}") # MESSAGE("PONYPROG_BINARY_DIR ${CURRENT_BUILD_DIR}")
# SET( PONYPROG_CPACK_PACKAGE_DESCRIPTION "Ponyprog free GUI for EEPROM and microcontroller flashing." ) # SET( PONYPROG_CPACK_PACKAGE_DESCRIPTION "Ponyprog free GUI for EEPROM and microcontroller flashing." )
SET( PONYPROG_CPACK_PACKAGE_FILE_NAME "ponyprog-setup-${PONYPROG_VERSION}" ) SET( PONYPROG_CPACK_PACKAGE_FILE_NAME "ponyprog-setup-${PONYPROG_VERSION}" )

4
distribution/posix/CMakeLists.txt
View File

@ -9,8 +9,8 @@ SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" )
SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" ) SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" )
INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" DESTINATION bin COMPONENT applications) 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}/icons" DESTINATION "/usr/share/" FILES_MATCHING PATTERN "*.png")
INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang" DESTINATION "/usr/share/ponyprog/" FILES_MATCHING PATTERN "*.*") 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 "*.*") INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/help" DESTINATION "/usr/share/ponyprog/" FILES_MATCHING PATTERN "*.*")
# MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}") # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")