Martchus
/
geocoordinatecalculator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ensure custom install targets don't conflict 

(required when building as subdirectory)
This commit is contained in:
Martchus 2016-01-21 16:33:18 +01:00
parent f8e9c9a46f
commit e330c45199
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CMakeLists.txt
View File

@ -22,7 +22,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
set(META_APP_DESCRIPTION "Command line tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more.") set(META_APP_DESCRIPTION "Command line tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more.")
set(META_VERSION_MAJOR 1) set(META_VERSION_MAJOR 1)
set(META_VERSION_MINOR 1) set(META_VERSION_MINOR 1)
set(META_VERSION_PATCH 0) set(META_VERSION_PATCH 1)
set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}) set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH})
# stringification of meta data # stringification of meta data
@ -89,18 +89,26 @@ install(TARGETS ${META_PROJECT_NAME}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
COMPONENT binary COMPONENT binary
) )
add_custom_target(install-binary if(NOT TARGET install-binary)
DEPENDS ${META_PROJECT_NAME} add_custom_target(install-binary
COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" DEPENDS ${META_PROJECT_NAME}
) COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
add_custom_target(install-mingw-w64 )
DEPENDS install-binary endif()
) if(NOT TARGET install-mingw-w64)
add_custom_target(install-binary-strip add_custom_target(install-mingw-w64
DEPENDS ${META_PROJECT_NAME} DEPENDS install-binary
COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" )
) endif()
add_custom_target(install-mingw-w64-strip if(NOT TARGET install-binary-strip)
DEPENDS install-binary-strip add_custom_target(install-binary-strip
) DEPENDS ${META_PROJECT_NAME}
COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
)
endif()
if(NOT TARGET install-mingw-w64-strip)
add_custom_target(install-mingw-w64-strip
DEPENDS install-binary-strip
)
endif()

2
geocoordinatecalculator.pro
View File

@ -4,7 +4,7 @@ appname = "Geo coordinate calculator"
appauthor = Martchus appauthor = Martchus
appurl = "https://github.com/$${appauthor}/$${projectname}" appurl = "https://github.com/$${appauthor}/$${projectname}"
QMAKE_TARGET_DESCRIPTION = "Command line tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more." QMAKE_TARGET_DESCRIPTION = "Command line tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more."
VERSION = 1.1.0 VERSION = 1.1.1
# implicit configuration: no GUI # implicit configuration: no GUI
CONFIG += no-gui CONFIG += no-gui