QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-26 03:24:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix install framework

Browse Source
This commit is contained in:
Ivan Romanov 2016-05-26 22:35:32 +05:00
parent 583d450885
commit 9e4bf79543
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -200,6 +200,12 @@ set(PKGCONFIG_INSTALL_PREFIX "${QCA_LIBRARY_INSTALL_DIR}/pkgconfig" CACHE PATH "
normalize_path(QCA_PREFIX_INSTALL_DIR) normalize_path(QCA_PREFIX_INSTALL_DIR)
if(OSX_FRAMEWORK)
set(QCA_FULL_INCLUDE_INSTALL_DIR "${QCA_LIBRARY_INSTALL_DIR}/${QCA_LIB_NAME}.framework/Headers")
else()
set(QCA_FULL_INCLUDE_INSTALL_DIR "${QCA_INCLUDE_INSTALL_DIR}/QtCrypto")
endif()
# check for oportunity to use relative paths # check for oportunity to use relative paths
option(USE_RELATIVE_PATHS "Try to make relocatable package") option(USE_RELATIVE_PATHS "Try to make relocatable package")
@ -225,7 +231,7 @@ endforeach()
if(NOT WIN32) if(NOT WIN32)
if(OSX_FRAMEWORK) if(OSX_FRAMEWORK)
set(PKGCONFIG_CFLAGS "-F\${libdir} -I\${libdir}/${QCA_LIB_NAME}.framework/Headers") set(PKGCONFIG_CFLAGS "-F\${libdir} -I\${includedir}")
set(PKGCONFIG_LIBS "-F\${libdir} -framework ${QCA_LIB_NAME}") set(PKGCONFIG_LIBS "-F\${libdir} -framework ${QCA_LIB_NAME}")
else() else()
set(PKGCONFIG_CFLAGS "-I\${includedir}") set(PKGCONFIG_CFLAGS "-I\${includedir}")

2
qca2.pc.cmake
View File

@ -1,7 +1,7 @@
prefix=@QCA_PREFIX_INSTALL_DIR@ prefix=@QCA_PREFIX_INSTALL_DIR@
exec_prefix=@QCA_PREFIX_INSTALL_DIR@ exec_prefix=@QCA_PREFIX_INSTALL_DIR@
libdir=@QCA_LIBRARY_INSTALL_DIR@ libdir=@QCA_LIBRARY_INSTALL_DIR@
includedir=@QCA_INCLUDE_INSTALL_DIR@/QtCrypto includedir=@QCA_FULL_INCLUDE_INSTALL_DIR@
Name: QCA Name: QCA
Description: Qt Cryptographic Architecture library Description: Qt Cryptographic Architecture library

12
src/CMakeLists.txt
View File

@ -168,16 +168,16 @@ set_target_properties(${QCA_LIB_NAME} PROPERTIES
) )
if(NOT DEVELOPER_MODE) if(NOT DEVELOPER_MODE)
install(TARGETS ${QCA_LIB_NAME} # Do not split 'PUBLIC_HEADER ...' line. It means install headers to folder
EXPORT ${QCA_CONFIG_NAME_BASE}Targets # and set this folder as -I flag for imported target.
# Also EXPORT doesn't actually install any files. It only created a new target.
install(TARGETS ${QCA_LIB_NAME} EXPORT ${QCA_CONFIG_NAME_BASE}Targets
LIBRARY DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" LIBRARY DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
RUNTIME DESTINATION "${QCA_BINARY_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_BINARY_INSTALL_DIR}"
ARCHIVE DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
FRAMEWORK DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" FRAMEWORK DESTINATION "${QCA_LIBRARY_INSTALL_DIR}"
PUBLIC_HEADER DESTINATION "${QCA_INCLUDE_INSTALL_DIR}/QtCrypto" PUBLIC_HEADER DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}" INCLUDES DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}"
INCLUDES DESTINATION "${QCA_INCLUDE_INSTALL_DIR}/QtCrypto" )
)
install_pdb(${QCA_LIB_NAME} ${QCA_BINARY_INSTALL_DIR}) install_pdb(${QCA_LIB_NAME} ${QCA_BINARY_INSTALL_DIR})
endif() endif()