diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-09-12 19:09:29 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-12 10:09:29 -0700 |
| commit | 9781bea65e38ad0c48b205a3d48c992984ed1bdc (patch) | |
| tree | 1c8d42e547ecb995e703cc8c67b034b0dc4c1679 | |
| parent | 96f4487c77fbf08518a9ee665612927c97ce8ebd (diff) | |
| download | vcpkg-9781bea65e38ad0c48b205a3d48c992984ed1bdc.tar.gz vcpkg-9781bea65e38ad0c48b205a3d48c992984ed1bdc.zip | |
[tinkerforge] Fix some issues. (#8148)
* [tinkerforge] fix error with config (wrong include path) and missing dependencies.
| -rw-r--r-- | ports/tinkerforge/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | ports/tinkerforge/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/tinkerforge/tinkerforgeConfig.cmake.in | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/ports/tinkerforge/CMakeLists.txt b/ports/tinkerforge/CMakeLists.txt index 671f7d145..3cd991650 100644 --- a/ports/tinkerforge/CMakeLists.txt +++ b/ports/tinkerforge/CMakeLists.txt @@ -5,19 +5,18 @@ if(WIN32) set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
endif()
-if(NOT TARGET_INSTALL_DIR)
- set(TARGET_INSTALL_DIR "share/${PROJECT_NAME}")
-endif()
+project(tinkerforge LANGUAGES C VERSION 2.1.25)
if(NOT CONFIG_INSTALL_DIR)
- set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}")
+ 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()
-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.
##---------------------------------------------------------------------------------------##
diff --git a/ports/tinkerforge/portfile.cmake b/ports/tinkerforge/portfile.cmake index 128f72e32..cfc5c3989 100644 --- a/ports/tinkerforge/portfile.cmake +++ b/ports/tinkerforge/portfile.cmake @@ -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 diff --git a/ports/tinkerforge/tinkerforgeConfig.cmake.in b/ports/tinkerforge/tinkerforgeConfig.cmake.in index 440db8a6c..07b771c65 100644 --- a/ports/tinkerforge/tinkerforgeConfig.cmake.in +++ b/ports/tinkerforge/tinkerforgeConfig.cmake.in @@ -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@") |