From 413dcf6b917ee9d2893946ed0253917746f969af Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Tue, 18 Oct 2016 14:34:02 -0400 Subject: add odb --- ports/libodb-sqlite/CONTROL | 4 +++ ports/libodb-sqlite/portfile.cmake | 28 +++++++++++++++++++++ ports/libodb/CONTROL | 3 +++ ports/libodb/portfile.cmake | 50 ++++++++++++++++++++++++++++++++++++++ ports/odb/CONTROL | 3 +++ ports/odb/portfile.cmake | 22 +++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 ports/libodb-sqlite/CONTROL create mode 100644 ports/libodb-sqlite/portfile.cmake create mode 100644 ports/libodb/CONTROL create mode 100644 ports/libodb/portfile.cmake create mode 100644 ports/odb/CONTROL create mode 100644 ports/odb/portfile.cmake diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL new file mode 100644 index 000000000..03b8ec2f3 --- /dev/null +++ b/ports/libodb-sqlite/CONTROL @@ -0,0 +1,4 @@ +Source: libodb-sqlite +Version: +Description: +Build-Depends: libodb, sqlite3 diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake new file mode 100644 index 000000000..3c8876c29 --- /dev/null +++ b/ports/libodb-sqlite/portfile.cmake @@ -0,0 +1,28 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-sqlite-2.4.0) +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-sqlite-2.4.0.tar.gz" + FILENAME "libodb-sqlite-2.4.0.tar.gz" + SHA512 af16da7c82cf8845ca3b393fbd8957a92b05ebc925a5191f20d414ab558345850073cd9c46457d0ef0edfb12ebcb27f267b934c9c69ef598380242fe920c8577 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_execute_required_process(COMMAND devenv libodb-sqlite-vc12.sln /upgrade WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME devenv_upgrade.log) +set(ENV{INCLUDE} "$ENV{INCLUDE};${CURRENT_INSTALLED_DIR}/include") +set(ENV{LIB} "$ENV{LIB};${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/debug/lib") +if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86") + set(MSBUILD_PLATFORM "Win32") +else() + set(MSBUILD_PLATFORM "x64") +endif() +vcpkg_build_msbuild(PROJECT_PATH "${SOURCE_PATH}\\libodb-sqlite-vc12.sln" PLATFORM ${MSBUILD_PLATFORM} + OPTIONS "/p:useenv=true") diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL new file mode 100644 index 000000000..f9645d098 --- /dev/null +++ b/ports/libodb/CONTROL @@ -0,0 +1,3 @@ +Source: libodb +Version: 2.4.0 +Description: ODB library, base runtime for the ODB ORM solution diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake new file mode 100644 index 000000000..fdb5f9467 --- /dev/null +++ b/ports/libodb/portfile.cmake @@ -0,0 +1,50 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-2.4.0) +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-2.4.0.tar.gz" + FILENAME "libodb-2.4.0.tar.gz" + SHA512 f1311458634695eb6ba307ebfd492e3b260e7beb06db1c5c46df58c339756be4006322cdc4e42d055bf5b2ad14ce4656ddcafcc4e16c282034db8a77d255c3eb +) +vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_execute_required_process(COMMAND devenv libodb-vc12.sln /upgrade WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME devenv_upgrade.log) +if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86") + set(MSBUILD_PLATFORM "Win32") +else() + set(MSBUILD_PLATFORM "x64") +endif() +vcpkg_build_msbuild(PROJECT_PATH "${SOURCE_PATH}\\libodb-vc12.sln" PLATFORM ${MSBUILD_PLATFORM}) + +if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86") +file(INSTALL ${SOURCE_PATH}/bin/odb-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.dll) +file(INSTALL ${SOURCE_PATH}/bin/odb-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.pdb) +file(INSTALL ${SOURCE_PATH}/bin/odb-d-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/odb-2.4-vc14.dll) +file(INSTALL ${SOURCE_PATH}/bin/odb-d-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/odb-d-2.4-vc14.pdb) +file(INSTALL ${SOURCE_PATH}/lib/odb.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${SOURCE_PATH}/lib/odb-d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +elseif(${TRIPLET_SYSTEM_ARCH} STREQUAL "x64") +file(INSTALL ${SOURCE_PATH}/bin64/odb-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.dll) +file(INSTALL ${SOURCE_PATH}/bin64/odb-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.pdb) +file(INSTALL ${SOURCE_PATH}/bin64/odb-d-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.dll) +file(INSTALL ${SOURCE_PATH}/bin64/odb-d-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-d-2.4-vc14.pdb) +file(INSTALL ${SOURCE_PATH}/lib64/odb.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${SOURCE_PATH}/lib64/odb-d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() + +#file(GLOB_RECURSE INCLUDE_FILES LIST_DIRECTORIES false RELATIVE ${SOURCE_DIR}) +file(INSTALL ${SOURCE_PATH}/odb DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx") +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) diff --git a/ports/odb/CONTROL b/ports/odb/CONTROL new file mode 100644 index 000000000..3806377c0 --- /dev/null +++ b/ports/odb/CONTROL @@ -0,0 +1,3 @@ +Source: odb +Version: +Description: diff --git a/ports/odb/portfile.cmake b/ports/odb/portfile.cmake new file mode 100644 index 000000000..28325eacb --- /dev/null +++ b/ports/odb/portfile.cmake @@ -0,0 +1,22 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/odb-2.4.0) +vcpkg_download_distfile(TOOL_ARCHIVE_FILE + URLS "http://www.codesynthesis.com/download/odb/2.4/odb-2.4.0-i686-windows.zip" + FILENAME "odb-2.4.0.zip" +) +vcpkg_extract_source_archive(${TOOL_ARCHIVE_FILE}) + + + +# Handle copyright +#file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb) +#file(RENAME ${CURRENT_PACKAGES_DIR}/share/odb/LICENSE ${CURRENT_PACKAGES_DIR}/share/odb/copyright) -- cgit v1.2.3 From f6fcd77e21215133ded2c3b6e7559d99ffcb70e4 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Tue, 18 Oct 2016 17:57:53 -0400 Subject: cmake port for libodb --- ports/libodb-sqlite/portfile.cmake | 3 +++ ports/libodb/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ ports/libodb/portfile.cmake | 36 ++++++------------------------------ 3 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 ports/libodb/CMakeLists.txt diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 3c8876c29..2a471a034 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -26,3 +26,6 @@ else() endif() vcpkg_build_msbuild(PROJECT_PATH "${SOURCE_PATH}\\libodb-sqlite-vc12.sln" PLATFORM ${MSBUILD_PLATFORM} OPTIONS "/p:useenv=true") + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) \ No newline at end of file diff --git a/ports/libodb/CMakeLists.txt b/ports/libodb/CMakeLists.txt new file mode 100644 index 000000000..d5d14baa2 --- /dev/null +++ b/ports/libodb/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb VERSION 2.4.0 LANGUAGES CXX) +set(LIBODB_INSTALL_HEADERS:BOOL CACHE OFF) +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +add_library(libodb ${libodb_src}) +target_include_directories(libodb + PUBLIC $ +) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb PRIVATE + -DLIBODB_DYNAMIC_LIB) +else() + target_compile_definitions(libodb PRIVATE + -DLIBODB_STATIC_LIB) +endif() +install(TARGETS libodb EXPORT libodbConfig + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" +) +endif() +install(EXPORT libodbConfig DESTINATION share/libodb) +export(TARGETS libodb NAMESPACE libodb FILE libodbConfig.cmake) diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index fdb5f9467..b389d6ff0 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -15,36 +15,12 @@ vcpkg_download_distfile(ARCHIVE SHA512 f1311458634695eb6ba307ebfd492e3b260e7beb06db1c5c46df58c339756be4006322cdc4e42d055bf5b2ad14ce4656ddcafcc4e16c282034db8a77d255c3eb ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_execute_required_process(COMMAND devenv libodb-vc12.sln /upgrade WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME devenv_upgrade.log) -if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86") - set(MSBUILD_PLATFORM "Win32") -else() - set(MSBUILD_PLATFORM "x64") -endif() -vcpkg_build_msbuild(PROJECT_PATH "${SOURCE_PATH}\\libodb-vc12.sln" PLATFORM ${MSBUILD_PLATFORM}) - -if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86") -file(INSTALL ${SOURCE_PATH}/bin/odb-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.dll) -file(INSTALL ${SOURCE_PATH}/bin/odb-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.pdb) -file(INSTALL ${SOURCE_PATH}/bin/odb-d-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/odb-2.4-vc14.dll) -file(INSTALL ${SOURCE_PATH}/bin/odb-d-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/odb-d-2.4-vc14.pdb) -file(INSTALL ${SOURCE_PATH}/lib/odb.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/lib/odb-d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -elseif(${TRIPLET_SYSTEM_ARCH} STREQUAL "x64") -file(INSTALL ${SOURCE_PATH}/bin64/odb-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.dll) -file(INSTALL ${SOURCE_PATH}/bin64/odb-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.pdb) -file(INSTALL ${SOURCE_PATH}/bin64/odb-d-2.4-vc12.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-2.4-vc14.dll) -file(INSTALL ${SOURCE_PATH}/bin64/odb-d-2.4-vc12.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin/odb-d-2.4-vc14.pdb) -file(INSTALL ${SOURCE_PATH}/lib64/odb.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/lib64/odb-d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -endif() - -#file(GLOB_RECURSE INCLUDE_FILES LIST_DIRECTORIES false RELATIVE ${SOURCE_DIR}) -file(INSTALL ${SOURCE_PATH}/odb DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING - PATTERN "*.h" - PATTERN "*.hxx" - PATTERN "*.ixx" - PATTERN "*.txx") +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) -- cgit v1.2.3 From cc6fdbeb8baf7882fc701c9778e9b2f8ba6afd4c Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Tue, 18 Oct 2016 19:53:43 -0400 Subject: more work on libodb --- ports/libodb-sqlite/CMakeLists.txt | 43 ++++++++++++++++++++++++++++++++++++++ ports/libodb-sqlite/portfile.cmake | 18 +++++++--------- ports/libodb/CMakeLists.txt | 11 ++++++---- ports/libodb/portfile.cmake | 8 +++++++ 4 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 ports/libodb-sqlite/CMakeLists.txt diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt new file mode 100644 index 000000000..89b99f529 --- /dev/null +++ b/ports/libodb-sqlite/CMakeLists.txt @@ -0,0 +1,43 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX) +find_package(libodb REQUIRED VERSION 2.4.0) +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +add_library(sqlite ${libodb_src}) +target_include_directories(sqlite + PUBLIC + $ + $ + +) +target_link_libraries(sqlite libodb::libodb) +if(BUILD_SHARED_LIBS) + target_compile_definitions(sqlite PRIVATE + -DLIBODB_SQLITE_DYNAMIC_LIB + -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) +else() + target_compile_definitions(sqlite PRIVATE + -DLIBODB_SQLITE_STATIC_LIB + -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) +endif() +install(TARGETS sqlite EXPORT libodb_sqliteConfig + COMPONENT sqlite + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + COMPONENT sqlite + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" +) +endif() +install(EXPORT libodb_sqliteConfig DESTINATION share/libodb) +export(TARGETS sqlite NAMESPACE libodb FILE libodb_sqliteConfig.cmake) diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 2a471a034..0c536066a 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -16,16 +16,14 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_execute_required_process(COMMAND devenv libodb-sqlite-vc12.sln /upgrade WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME devenv_upgrade.log) -set(ENV{INCLUDE} "$ENV{INCLUDE};${CURRENT_INSTALLED_DIR}/include") -set(ENV{LIB} "$ENV{LIB};${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/debug/lib") -if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86") - set(MSBUILD_PLATFORM "Win32") -else() - set(MSBUILD_PLATFORM "x64") -endif() -vcpkg_build_msbuild(PROJECT_PATH "${SOURCE_PATH}\\libodb-sqlite-vc12.sln" PLATFORM ${MSBUILD_PLATFORM} - OPTIONS "/p:useenv=true") +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) +vcpkg_build_cmake() +vcpkg_install_cmake() file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) \ No newline at end of file diff --git a/ports/libodb/CMakeLists.txt b/ports/libodb/CMakeLists.txt index d5d14baa2..0d13ecefd 100644 --- a/ports/libodb/CMakeLists.txt +++ b/ports/libodb/CMakeLists.txt @@ -1,13 +1,16 @@ cmake_minimum_required(VERSION 3.0) project(libodb VERSION 2.4.0 LANGUAGES CXX) -set(LIBODB_INSTALL_HEADERS:BOOL CACHE OFF) +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cxx) list(FILTER libodb_src EXCLUDE REGEX /posix/.*) add_library(libodb ${libodb_src}) target_include_directories(libodb - PUBLIC $ + PUBLIC + $ + $ + ) if(BUILD_SHARED_LIBS) target_compile_definitions(libodb PRIVATE @@ -30,5 +33,5 @@ install(DIRECTORY odb DESTINATION include/ PATTERN "*.txx" ) endif() -install(EXPORT libodbConfig DESTINATION share/libodb) -export(TARGETS libodb NAMESPACE libodb FILE libodbConfig.cmake) +install(EXPORT libodbConfig NAMESPACE libodb:: DESTINATION share/libodb) +export(TARGETS libodb NAMESPACE libodb:: FILE libodbConfig.cmake) diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index b389d6ff0..493bcc438 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -21,6 +21,14 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) +vcpkg_build_cmake() +vcpkg_install_cmake() +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/libodb/libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/libodb/libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From c879ba6d362876be57bdb378ce4d0a9de64fc6c2 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Wed, 19 Oct 2016 00:30:28 -0400 Subject: add overall odb config --- ports/libodb-sqlite/CMakeLists.txt | 12 +++++++----- ports/libodb-sqlite/CONTROL | 4 ++-- ports/libodb/CMakeLists.txt | 8 +++++--- ports/libodb/odbConfig.cmake | 10 ++++++++++ ports/libodb/portfile.cmake | 10 ++++++++-- 5 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 ports/libodb/odbConfig.cmake diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt index 89b99f529..44f368537 100644 --- a/ports/libodb-sqlite/CMakeLists.txt +++ b/ports/libodb-sqlite/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX) -find_package(libodb REQUIRED VERSION 2.4.0) +find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +find_library(SQLITE3_LIBRARY names sqlite sqlite3) set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} @@ -13,7 +14,8 @@ target_include_directories(sqlite $ ) -target_link_libraries(sqlite libodb::libodb) + +target_link_libraries(sqlite PRIVATE odb::libodb ${SQLITE3_LIBRARY}) if(BUILD_SHARED_LIBS) target_compile_definitions(sqlite PRIVATE -DLIBODB_SQLITE_DYNAMIC_LIB @@ -23,7 +25,7 @@ else() -DLIBODB_SQLITE_STATIC_LIB -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) endif() -install(TARGETS sqlite EXPORT libodb_sqliteConfig +install(TARGETS sqlite EXPORT odb_sqliteConfig COMPONENT sqlite ARCHIVE DESTINATION lib LIBRARY DESTINATION lib @@ -39,5 +41,5 @@ install(DIRECTORY odb DESTINATION include/ PATTERN "*.txx" ) endif() -install(EXPORT libodb_sqliteConfig DESTINATION share/libodb) -export(TARGETS sqlite NAMESPACE libodb FILE libodb_sqliteConfig.cmake) +install(EXPORT odb_sqliteConfig NAMESPACE odb:: COMPONENT sqlite DESTINATION share/odb) +export(TARGETS sqlite NAMESPACE odb:: FILE odb_sqliteConfig.cmake) diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL index 03b8ec2f3..5a87fb847 100644 --- a/ports/libodb-sqlite/CONTROL +++ b/ports/libodb-sqlite/CONTROL @@ -1,4 +1,4 @@ Source: libodb-sqlite -Version: -Description: +Version: 2.4.0 +Description: Sqlite support for the ODB ORM library Build-Depends: libodb, sqlite3 diff --git a/ports/libodb/CMakeLists.txt b/ports/libodb/CMakeLists.txt index 0d13ecefd..b4aef5817 100644 --- a/ports/libodb/CMakeLists.txt +++ b/ports/libodb/CMakeLists.txt @@ -19,13 +19,15 @@ else() target_compile_definitions(libodb PRIVATE -DLIBODB_STATIC_LIB) endif() -install(TARGETS libodb EXPORT libodbConfig +install(TARGETS libodb EXPORT odb_libodbConfig + COMPONENT libodb ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) if(LIBODB_INSTALL_HEADERS) install(DIRECTORY odb DESTINATION include/ + COMPONENT libodb FILES_MATCHING PATTERN "*.h" PATTERN "*.hxx" @@ -33,5 +35,5 @@ install(DIRECTORY odb DESTINATION include/ PATTERN "*.txx" ) endif() -install(EXPORT libodbConfig NAMESPACE libodb:: DESTINATION share/libodb) -export(TARGETS libodb NAMESPACE libodb:: FILE libodbConfig.cmake) +install(EXPORT odb_libodbConfig NAMESPACE odb:: COMPONENT libodb DESTINATION share/odb) +export(TARGETS libodb NAMESPACE odb:: FILE odb_libodbConfig.cmake) diff --git a/ports/libodb/odbConfig.cmake b/ports/libodb/odbConfig.cmake new file mode 100644 index 000000000..21631fadf --- /dev/null +++ b/ports/libodb/odbConfig.cmake @@ -0,0 +1,10 @@ +set(_supported_components libodb sqlite) + +foreach(_comp ${odb_FIND_COMPONENTS}) + if(NOT ";${_supported_components};" MATCHES _comp) + set(odb_FOUND False) + set(odb_NOTFOUND_MESSAGE "Unsupported component: ${_comp}") + endif() + include("${CMAKE_CURRENT_LIST_DIR}/odb_${_comp}Config.cmake") +endforeach() +set(odb_FOUND True) \ No newline at end of file diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 493bcc438..770cc0948 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -8,6 +8,7 @@ include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) +include(CMakePackageConfigHelpers) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-2.4.0) vcpkg_download_distfile(ARCHIVE URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-2.4.0.tar.gz" @@ -23,10 +24,15 @@ vcpkg_configure_cmake( ) vcpkg_build_cmake() vcpkg_install_cmake() -file(READ ${CURRENT_PACKAGES_DIR}/debug/share/libodb/libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libodb/libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/odbConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb) +write_basic_package_version_file(${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVersion.cmake + VERSION 2.4.0 + COMPATIBILITY SameMajorVersion +) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) -- cgit v1.2.3 From 2aa034bf47b9c16d9874d794ef9fabf5321ac8f7 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Wed, 19 Oct 2016 00:39:26 -0400 Subject: more random changes --- ports/libodb-sqlite/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt index 44f368537..43a2e7a56 100644 --- a/ports/libodb-sqlite/CMakeLists.txt +++ b/ports/libodb-sqlite/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX) find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) -find_library(SQLITE3_LIBRARY names sqlite sqlite3) +find_package(sqlite3 REQUIRED) set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} @@ -15,7 +15,7 @@ target_include_directories(sqlite ) -target_link_libraries(sqlite PRIVATE odb::libodb ${SQLITE3_LIBRARY}) +target_link_libraries(sqlite PRIVATE odb::libodb sqlite3) if(BUILD_SHARED_LIBS) target_compile_definitions(sqlite PRIVATE -DLIBODB_SQLITE_DYNAMIC_LIB -- cgit v1.2.3 From 8de99463fa8f5b54d120e14eb233411101c69ab3 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Wed, 19 Oct 2016 01:28:50 -0400 Subject: more odb-sqlite --- ports/libodb-sqlite/CMakeLists.txt | 14 +++++++------- ports/libodb-sqlite/portfile.cmake | 9 +++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt index 43a2e7a56..bd1717899 100644 --- a/ports/libodb-sqlite/CMakeLists.txt +++ b/ports/libodb-sqlite/CMakeLists.txt @@ -7,25 +7,25 @@ file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cxx) list(FILTER libodb_src EXCLUDE REGEX /posix/.*) -add_library(sqlite ${libodb_src}) -target_include_directories(sqlite +add_library(libodb-sqlite ${libodb_src}) +target_include_directories(libodb-sqlite PUBLIC $ $ ) -target_link_libraries(sqlite PRIVATE odb::libodb sqlite3) +target_link_libraries(libodb-sqlite PRIVATE odb::libodb sqlite3) if(BUILD_SHARED_LIBS) - target_compile_definitions(sqlite PRIVATE + target_compile_definitions(libodb-sqlite PRIVATE -DLIBODB_SQLITE_DYNAMIC_LIB -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) else() - target_compile_definitions(sqlite PRIVATE + target_compile_definitions(libodb-sqlite PRIVATE -DLIBODB_SQLITE_STATIC_LIB -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) endif() -install(TARGETS sqlite EXPORT odb_sqliteConfig +install(TARGETS libodb-sqlite EXPORT odb_sqliteConfig COMPONENT sqlite ARCHIVE DESTINATION lib LIBRARY DESTINATION lib @@ -42,4 +42,4 @@ install(DIRECTORY odb DESTINATION include/ ) endif() install(EXPORT odb_sqliteConfig NAMESPACE odb:: COMPONENT sqlite DESTINATION share/odb) -export(TARGETS sqlite NAMESPACE odb:: FILE odb_sqliteConfig.cmake) +export(TARGETS libodb-sqlite NAMESPACE odb:: FILE odb_sqliteConfig.cmake) \ No newline at end of file diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 0c536066a..27d157bf5 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -25,5 +25,10 @@ vcpkg_configure_cmake( vcpkg_build_cmake() vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb/copyright) \ No newline at end of file +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite/LICENSE ${CURRENT_PACKAGES_DIR}/share/libodb-sqlite/copyright) +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3 From a779bbe8ca42d5e253cf6803763c8d108b12c6e7 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Wed, 19 Oct 2016 15:13:05 -0400 Subject: removed odb binary package --- ports/odb/CONTROL | 3 --- ports/odb/portfile.cmake | 22 ---------------------- 2 files changed, 25 deletions(-) delete mode 100644 ports/odb/CONTROL delete mode 100644 ports/odb/portfile.cmake diff --git a/ports/odb/CONTROL b/ports/odb/CONTROL deleted file mode 100644 index 3806377c0..000000000 --- a/ports/odb/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: odb -Version: -Description: diff --git a/ports/odb/portfile.cmake b/ports/odb/portfile.cmake deleted file mode 100644 index 28325eacb..000000000 --- a/ports/odb/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - -include(${CMAKE_TRIPLET_FILE}) -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/odb-2.4.0) -vcpkg_download_distfile(TOOL_ARCHIVE_FILE - URLS "http://www.codesynthesis.com/download/odb/2.4/odb-2.4.0-i686-windows.zip" - FILENAME "odb-2.4.0.zip" -) -vcpkg_extract_source_archive(${TOOL_ARCHIVE_FILE}) - - - -# Handle copyright -#file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb) -#file(RENAME ${CURRENT_PACKAGES_DIR}/share/odb/LICENSE ${CURRENT_PACKAGES_DIR}/share/odb/copyright) -- cgit v1.2.3