mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 15:32:47 +08:00
[libaaplus] Update to 2.36 (#20228)
* [libaaplus] Update to 2.36 * Export include path
This commit is contained in:
NancyLi1013
GitHub
parent
124239f751
commit
84117b9736
@ -1,69 +0,0 @@
|
||||
PROJECT (AstronomicalAlgorithms)
|
||||
|
||||
cmake_minimum_required(VERSION 3.11)
|
||||
cmake_policy(VERSION 3.11)
|
||||
|
||||
project(libaaplus LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
|
||||
option(BUILD_TOOLS "Build libaaplus tools" OFF)
|
||||
|
||||
file(GLOB LIBS_SRC RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*.cpp)
|
||||
|
||||
list(REMOVE_ITEM ${LIBS_SRC} AATest.cpp)
|
||||
|
||||
file(GLOB PUBLIC_HEADERS RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
||||
|
||||
set(TEST_SRCS
|
||||
AATest.cpp
|
||||
)
|
||||
|
||||
add_library(libaaplus
|
||||
${LIBS_SRC}
|
||||
)
|
||||
|
||||
if (MSVC AND BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(libaaplus
|
||||
PRIVATE
|
||||
-DAAPLUS_EXT_CLASS\=__declspec\(dllexport\)
|
||||
)
|
||||
endif (MSVC AND BUILD_SHARED_LIBS)
|
||||
|
||||
install(
|
||||
TARGETS libaaplus
|
||||
EXPORT libaaplus
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION bin
|
||||
)
|
||||
|
||||
# Headers makes relative includes so directory structure must be kept
|
||||
foreach(HEADER ${PUBLIC_HEADERS})
|
||||
get_filename_component(HEADER_DIR ${HEADER} DIRECTORY)
|
||||
install(
|
||||
FILES ${HEADER}
|
||||
DESTINATION include/aaplus/${HEADER_DIR}
|
||||
)
|
||||
endforeach()
|
||||
|
||||
|
||||
if (BUILD_TOOLS)
|
||||
add_executable(aatest AATest.cpp)
|
||||
target_link_libraries(aatest PRIVATE libaaplus)
|
||||
if (BUILD_SHARED_LIBS AND MSVC)
|
||||
target_compile_definitions(aatest
|
||||
PUBLIC
|
||||
-DAAPLUS_EXT_CLASS\=__declspec\(dllimport\)
|
||||
)
|
||||
endif (BUILD_SHARED_LIBS AND MSVC)
|
||||
|
||||
install(TARGETS aatest RUNTIME DESTINATION tools/aaplus)
|
||||
endif()
|
||||
|
||||
install(
|
||||
EXPORT libaaplus
|
||||
DESTINATION share/libaaplus
|
||||
FILE libaaplusConfig.cmake
|
||||
NAMESPACE libaaplus::
|
||||
)
|
||||
85
ports/libaaplus/fix-cmakelists.patch
Normal file
85
ports/libaaplus/fix-cmakelists.patch
Normal file
@ -0,0 +1,85 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9bb8ea3..c445c4b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.8)
|
||||
SET(CMAKE_CXX_STANDARD 17)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
+option(BUILD_TOOLS "Build libaaplus tools" OFF)
|
||||
#-----------------------------------------------------------------------------
|
||||
# Output directories.
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH
|
||||
@@ -261,18 +262,66 @@ SET ( SRCS
|
||||
#-----------------------------------------------------------------------------
|
||||
# Executables.
|
||||
#-----------------------------------------------------------------------------
|
||||
+if(BUILD_TOOLS)
|
||||
ADD_EXECUTABLE(AATest ${SRCS} )
|
||||
-
|
||||
+endif()
|
||||
#-----------------------------------------------------------------------------
|
||||
# Libraries.
|
||||
+if(NOT BUILD_SHARED_LIBS)
|
||||
ADD_LIBRARY(aaplus-static STATIC ${SRCS_LIB} ${INCS})
|
||||
SET_TARGET_PROPERTIES(aaplus-static PROPERTIES OUTPUT_NAME "aaplus")
|
||||
-
|
||||
+target_include_directories(aaplus-static PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/aaplus>)
|
||||
+else()
|
||||
ADD_LIBRARY(aaplus-shared SHARED ${SRCS_LIB} ${INCS})
|
||||
SET_TARGET_PROPERTIES(aaplus-shared PROPERTIES OUTPUT_NAME "aaplus")
|
||||
+target_include_directories(aaplus-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/aaplus>)
|
||||
+endif()
|
||||
+
|
||||
+if (MSVC AND BUILD_SHARED_LIBS)
|
||||
+target_compile_definitions(aaplus-shared
|
||||
+ PRIVATE
|
||||
+ -DAAPLUS_EXT_CLASS\=__declspec\(dllexport\)
|
||||
+)
|
||||
+endif (MSVC AND BUILD_SHARED_LIBS)
|
||||
+
|
||||
+if(BUILD_SHARED_LIBS)
|
||||
+ install(
|
||||
+ TARGETS aaplus-shared
|
||||
+ EXPORT aaplus
|
||||
+ ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION lib
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ )
|
||||
+else()
|
||||
+ install(
|
||||
+ TARGETS aaplus-static
|
||||
+ EXPORT aaplus
|
||||
+ ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION lib
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ )
|
||||
+endif()
|
||||
|
||||
-install(TARGETS aaplus-shared aaplus-static
|
||||
- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
|
||||
+if(BUILD_TOOLS)
|
||||
+ if(BUILD_SHARED_LIBS)
|
||||
+ TARGET_LINK_LIBRARIES(AATest aaplus-shared)
|
||||
+ if(MSVC)
|
||||
+ target_compile_definitions(AATest
|
||||
+ PUBLIC
|
||||
+ -DAAPLUS_EXT_CLASS\=__declspec\(dllimport\)
|
||||
+ )
|
||||
+ endif()
|
||||
+
|
||||
+ else()
|
||||
+ TARGET_LINK_LIBRARIES(AATest aaplus-static)
|
||||
+ endif()
|
||||
+endif()
|
||||
|
||||
-TARGET_LINK_LIBRARIES(AATest aaplus-static)
|
||||
+install(
|
||||
+ EXPORT aaplus
|
||||
+ DESTINATION share/aaplus
|
||||
+ FILE aaplusConfig.cmake
|
||||
+ NAMESPACE aaplus::
|
||||
+)
|
||||
|
||||
+install(FILES ${INCS} DESTINATION include/aaplus)
|
||||
\ No newline at end of file
|
||||
@ -1,10 +1,10 @@
|
||||
set(VERSION 2.12)
|
||||
set(VERSION 2.36)
|
||||
|
||||
vcpkg_download_distfile(
|
||||
ARCHIVE_FILE
|
||||
URLS "http://www.naughter.com/download/aaplus_v${VERSION}.zip"
|
||||
FILENAME "aaplus_v${VERSION}.zip"
|
||||
SHA512 ec3a3d1346637fbed3ec5093ded821c6d80950a6432378d9826ed842571d8670cd5d2a1c9ff58a18f308e18669d786f72d24961e26bd8e070ee35674688a39e7
|
||||
SHA512 a7abf20feb49df00b95be987809a3dc8df3e9ff706dd5a873ecfdd695af125f858264e092b6b856e83685e9eb46fd46520cf09dfae892c32cbb71f925ba17b86
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
@ -12,25 +12,26 @@ vcpkg_extract_source_archive_ex(
|
||||
ARCHIVE ${ARCHIVE_FILE}
|
||||
REF ${VERSION}
|
||||
NO_REMOVE_ONE_LEVEL
|
||||
PATCHES
|
||||
fix-cmakelists.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
tools BUILD_TOOLS
|
||||
FEATURES
|
||||
tools BUILD_TOOLS
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/libaaplus)
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME aaplus CONFIG_PATH share/aaplus)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/AA+.htm DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/AA+.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
@ -1,9 +1,18 @@
|
||||
{
|
||||
"name": "libaaplus",
|
||||
"version-string": "2.12",
|
||||
"port-version": 2,
|
||||
"version": "2.36",
|
||||
"description": "libaaplus is an astronomical computations library by naughter software",
|
||||
"homepage": "http://www.naughter.com/aa.html",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"tools": {
|
||||
"description": "Build libaaplus tools"
|
||||
|
||||
@ -3201,8 +3201,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"libaaplus": {
|
||||
"baseline": "2.12",
|
||||
"port-version": 2
|
||||
"baseline": "2.36",
|
||||
"port-version": 0
|
||||
},
|
||||
"libaiff": {
|
||||
"baseline": "5.0",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "196f02649779e1a3b06c9d0c32b41082205c69b5",
|
||||
"version": "2.36",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "350415271eff06157085854060050dcbc80448a9",
|
||||
"version-string": "2.12",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user