mirror of
https://github.com/pocoproject/poco.git
synced 2025-03-23 07:29:53 +01:00
CMake: Improve installation and package generation
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
This commit is contained in:
parent
b2e209bf54
commit
f778e67430
@ -26,24 +26,10 @@ target_include_directories( "${LIBNAME}"
|
|||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
DIRECTORY include/Poco
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -27,24 +27,11 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
@ -34,54 +34,41 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if(ENABLE_DATA_SQLITE)
|
if(ENABLE_DATA_SQLITE)
|
||||||
# SQlite3 is built in any case
|
# SQlite3 is built in any case
|
||||||
add_subdirectory( SQLite )
|
add_subdirectory( SQLite )
|
||||||
endif(ENABLE_DATA_SQLITE)
|
endif(ENABLE_DATA_SQLITE)
|
||||||
|
|
||||||
if(ENABLE_DATA_MYSQL)
|
if(ENABLE_DATA_MYSQL)
|
||||||
find_package(MySQL)
|
find_package(MySQL)
|
||||||
if(MYSQL_FOUND)
|
if(MYSQL_FOUND)
|
||||||
include_directories("${MYSQL_INCLUDE_DIR}")
|
include_directories("${MYSQL_INCLUDE_DIR}")
|
||||||
message(STATUS "MySQL Support Enabled")
|
message(STATUS "MySQL Support Enabled")
|
||||||
add_subdirectory( MySQL )
|
add_subdirectory( MySQL )
|
||||||
else()
|
else()
|
||||||
message(STATUS "MySQL Support Disabled - no MySQL library")
|
message(STATUS "MySQL Support Disabled - no MySQL library")
|
||||||
endif(MYSQL_FOUND)
|
endif(MYSQL_FOUND)
|
||||||
endif(ENABLE_DATA_MYSQL)
|
endif(ENABLE_DATA_MYSQL)
|
||||||
|
|
||||||
if(ENABLE_DATA_ODBC)
|
if(ENABLE_DATA_ODBC)
|
||||||
find_package(ODBC)
|
find_package(ODBC)
|
||||||
if(WIN32 AND NOT WINCE)
|
if(WIN32 AND NOT WINCE)
|
||||||
set(ODBC_LIBRARIES "odbc32" "odbccp32")
|
set(ODBC_LIBRARIES "odbc32" "odbccp32")
|
||||||
message(STATUS "Windows native ODBC Support Enabled")
|
message(STATUS "Windows native ODBC Support Enabled")
|
||||||
add_subdirectory( ODBC )
|
|
||||||
else(WIN32 AND NOT WINCE)
|
|
||||||
if(ODBC_FOUND)
|
|
||||||
include_directories("${ODBC_INCLUDE_DIRECTORIES}")
|
|
||||||
message(STATUS "ODBC Support Enabled")
|
|
||||||
add_subdirectory( ODBC )
|
add_subdirectory( ODBC )
|
||||||
else()
|
else(WIN32 AND NOT WINCE)
|
||||||
message(STATUS "ODBC Support Disabled - no ODBC runtime")
|
if(ODBC_FOUND)
|
||||||
endif()
|
include_directories("${ODBC_INCLUDE_DIRECTORIES}")
|
||||||
endif(WIN32 AND NOT WINCE)
|
message(STATUS "ODBC Support Enabled")
|
||||||
|
add_subdirectory( ODBC )
|
||||||
|
else()
|
||||||
|
message(STATUS "ODBC Support Disabled - no ODBC runtime")
|
||||||
|
endif()
|
||||||
|
endif(WIN32 AND NOT WINCE)
|
||||||
endif(ENABLE_DATA_ODBC)
|
endif(ENABLE_DATA_ODBC)
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
|
@ -27,22 +27,9 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
|
@ -27,22 +27,9 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
|
@ -48,22 +48,9 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
|
@ -121,22 +121,8 @@ target_include_directories( "${LIBNAME}"
|
|||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
DIRECTORY include/Poco
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory( samples )
|
add_subdirectory( samples )
|
||||||
|
@ -26,25 +26,11 @@ target_include_directories( "${LIBNAME}"
|
|||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
DIRECTORY include/Poco
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -25,25 +25,12 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -34,25 +34,12 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -25,25 +25,12 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -25,26 +25,13 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
#TODO: Looks like the samples use crypto somehow?
|
#TODO: Looks like the samples use crypto somehow?
|
||||||
#add_subdirectory(samples)
|
#add_subdirectory(samples)
|
||||||
#add_subdirectory(testsuite)
|
#add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -130,25 +130,12 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -19,5 +19,3 @@ install(
|
|||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
INCLUDES DESTINATION include
|
INCLUDES DESTINATION include
|
||||||
)
|
)
|
||||||
|
|
||||||
#POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
@ -19,5 +19,3 @@ install(
|
|||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
INCLUDES DESTINATION include
|
INCLUDES DESTINATION include
|
||||||
)
|
)
|
||||||
|
|
||||||
#POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
@ -15,5 +15,3 @@ install(
|
|||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
INCLUDES DESTINATION include
|
INCLUDES DESTINATION include
|
||||||
)
|
)
|
||||||
|
|
||||||
#POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
@ -66,26 +66,13 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
# TODO: Add tests
|
# TODO: Add tests
|
||||||
#add_subdirectory(testsuite)
|
#add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -32,22 +32,8 @@ target_include_directories( "${LIBNAME}"
|
|||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
DIRECTORY include/Poco
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
|
@ -49,25 +49,11 @@ target_include_directories( "${LIBNAME}"
|
|||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
DIRECTORY include/Poco
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -25,25 +25,12 @@ target_include_directories( "${LIBNAME}"
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
)
|
)
|
||||||
install(
|
|
||||||
DIRECTORY include/Poco
|
|
||||||
DESTINATION include
|
|
||||||
COMPONENT Devel
|
|
||||||
PATTERN ".svn" EXCLUDE
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
POCO_INSTALL("${LIBNAME}")
|
||||||
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
|
POCO_GENERATE_PACKAGE("${LIBNAME}")
|
||||||
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
||||||
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
INCLUDES DESTINATION include
|
|
||||||
)
|
|
||||||
|
|
||||||
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
|
|
||||||
|
|
||||||
if (ENABLE_TESTS)
|
if (ENABLE_TESTS)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
add_subdirectory(testsuite)
|
add_subdirectory(testsuite)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -187,46 +187,67 @@ endmacro()
|
|||||||
#===============================================================================
|
#===============================================================================
|
||||||
# Macros for Package generation
|
# Macros for Package generation
|
||||||
#
|
#
|
||||||
#TODO: Document this!
|
|
||||||
# POCO_GENERATE_PACKAGE - Generates *Config.cmake
|
# POCO_GENERATE_PACKAGE - Generates *Config.cmake
|
||||||
# Usage: POCO_SOURCES_PLAT( out name platform sources)
|
# Usage: POCO_GENERATE_PACKAGE(target_name)
|
||||||
# INPUT:
|
# INPUT:
|
||||||
# out the variable the sources are added to
|
# target_name the name of the target. e.g. Foundation for PocoFoundation
|
||||||
# name: the name of the components
|
# Example: POCO_GENERATE_PACKAGE(Foundation)
|
||||||
# platform: the platform this sources are for (ON = All, OFF = None, WIN32, UNIX ...)
|
macro(POCO_GENERATE_PACKAGE target_name)
|
||||||
# sources: a list of files to add to ${out}
|
|
||||||
# Example: POCO_SOURCES_PLAT( SRCS Foundation ON src/Foundation.cpp )
|
|
||||||
macro(POCO_GENERATE_PACKAGE target_name export_name package_destination)
|
|
||||||
include(CMakePackageConfigHelpers)
|
include(CMakePackageConfigHelpers)
|
||||||
write_basic_package_version_file(
|
write_basic_package_version_file(
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}ConfigVersion.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}ConfigVersion.cmake"
|
||||||
VERSION ${PROJECT_VERSION}
|
VERSION ${PROJECT_VERSION}
|
||||||
COMPATIBILITY AnyNewerVersion
|
COMPATIBILITY AnyNewerVersion
|
||||||
)
|
)
|
||||||
export(EXPORT "${export_name}"
|
export(EXPORT "${target_name}Targets"
|
||||||
FILE "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}Targets.cmake"
|
FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Targets.cmake"
|
||||||
NAMESPACE "Poco::"
|
NAMESPACE "${PROJECT_NAME}::"
|
||||||
)
|
)
|
||||||
configure_file(cmake/Poco${target_name}Config.cmake
|
configure_file("cmake/Poco${target_name}Config.cmake"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}Config.cmake"
|
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
|
||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
|
|
||||||
set(ConfigPackageLocation "${package_destination}")
|
set(ConfigPackageLocation "lib/cmake/${PROJECT_NAME}")
|
||||||
|
|
||||||
install(
|
install(
|
||||||
EXPORT "${export_name}"
|
EXPORT "${target_name}Targets"
|
||||||
FILE "Poco${target_name}Targets.cmake"
|
FILE "${PROJECT_NAME}${target_name}Targets.cmake"
|
||||||
NAMESPACE "Poco::"
|
NAMESPACE "${PROJECT_NAME}::"
|
||||||
DESTINATION ${package_destination}
|
DESTINATION "lib/cmake/${PROJECT_NAME}"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
FILES
|
FILES
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}Config.cmake"
|
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}ConfigVersion.cmake"
|
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
|
||||||
DESTINATION ${package_destination}
|
DESTINATION "lib/cmake/${PROJECT_NAME}"
|
||||||
COMPONENT Devel
|
COMPONENT Devel
|
||||||
)
|
)
|
||||||
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
|
#===============================================================================
|
||||||
|
# Macros for simplified installation
|
||||||
|
#
|
||||||
|
# POCO_INSTALL - Install the given target
|
||||||
|
# Usage: POCO_INSTALL(target_name)
|
||||||
|
# INPUT:
|
||||||
|
# target_name the name of the target. e.g. Foundation for PocoFoundation
|
||||||
|
# Example: POCO_INSTALL(Foundation)
|
||||||
|
macro(POCO_INSTALL target_name)
|
||||||
|
install(
|
||||||
|
DIRECTORY include/Poco
|
||||||
|
DESTINATION include
|
||||||
|
COMPONENT Devel
|
||||||
|
PATTERN ".svn" EXCLUDE
|
||||||
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
TARGETS "${target_name}" EXPORT "${target_name}Targets"
|
||||||
|
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
||||||
|
ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
||||||
|
RUNTIME DESTINATION bin
|
||||||
|
INCLUDES DESTINATION include
|
||||||
|
)
|
||||||
|
endmacro()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user