The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[tinkerforge] Fix some issues. (#8148)

Browse Source 
* [tinkerforge] fix error with config (wrong include path) and missing dependencies.
This commit is contained in:
Alexander Neumann 2019-09-12 19:09:29 +02:00 committed by Phil Christensen
parent 96f4487c77
commit 9781bea65e
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ports/tinkerforge/CMakeLists.txt
View File

@ -5,19 +5,18 @@ if(WIN32)
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
endif()
project(tinkerforge LANGUAGES C VERSION 2.1.25)
if(NOT CONFIG_INSTALL_DIR)
set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}/")
endif()
if(NOT INCLUDE_INSTALL_DIR)
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
endif()
if(NOT TARGET_INSTALL_DIR)
set(TARGET_INSTALL_DIR "share/${PROJECT_NAME}")
endif()
if(NOT CONFIG_INSTALL_DIR)
set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}")
endif()
if(NOT INCLUDE_INSTALL_DIR)
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
endif()
project(tinkerforge LANGUAGES C VERSION 2.1.25)
file(GLOB CPP_FILES source/*.c)
file(GLOB H_FILES source/*.h)
@ -27,7 +26,13 @@ add_library(${PROJECT_NAME} ${CPP_FILES} ${H_FILES} ${DEF_FILE})
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}>)
target_link_libraries(${PROJECT_NAME} PUBLIC Ws2_32)
find_package(Threads)
target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
target_link_libraries(${PROJECT_NAME} PUBLIC Ws2_32 advapi32)
endif()
##---------------------------------------------------------------------------------------##
##----- Package definition.
##---------------------------------------------------------------------------------------##

2
ports/tinkerforge/portfile.cmake
View File

@ -24,7 +24,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share)
vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include

4
ports/tinkerforge/tinkerforgeConfig.cmake.in
View File

@ -1,5 +1,5 @@
@PACKAGE_INIT@
include ("@PACKAGE_TARGET_INSTALL_DIR@@PROJECT_NAME@Targets.cmake")
set_and_check(REFL_ENUM_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
include ("@PACKAGE_TARGET_INSTALL_DIR@/@PROJECT_NAME@Targets.cmake")
set_and_check(TINKERFORGE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
check_required_components("@PROJECT_NAME@")