Don't export/install rdtk

Although exported rdtk isn't really mature and stable yet therefore it is
not exported/installed anymore. In case FreeRDP is built without
static libraries librdtk is installed as part or the
FreeRDP-ShadowTargets exports as this is the only place it is used right
now.

diff --git a/rdtk/CMakeLists.txt b/rdtk/CMakeLists.txt
index f7485dd..9028678 100644 (file)
--- a/rdtk/CMakeLists.txt
+++ b/rdtk/CMakeLists.txt
@@ -40,14 +40,6 @@ include(CheckCCompilerFlag)
 include(GNUInstallDirsWrapper)
 include(CMakePackageConfigHelpers)
 
-# Soname versioning
-set(RDTK_VERSION_MAJOR "2")
-set(RDTK_VERSION_MINOR "0")
-set(RDTK_VERSION_REVISION "0")
-set(RDTK_API_VERSION "${RDTK_VERSION_MAJOR}")
-set(RDTK_VERSION "${RDTK_VERSION_MAJOR}.${RDTK_VERSION_MINOR}.${RDTK_VERSION_REVISION}")
-set(RDTK_VERSION_FULL "${RDTK_VERSION}")
-
 # Default to release build type
 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
@@ -63,7 +55,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRDTK_EXPORTS")
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 
-add_subdirectory(include)
 add_subdirectory(librdtk)
 
 if(WITH_SAMPLE)
@@ -71,26 +62,3 @@ if(WITH_SAMPLE)
                add_subdirectory(sample)
        endif()
 endif()
-
-# Exporting
-set(RDTK_INCLUDE_DIR "include/rdtk${RDTK_VERSION_MAJOR}")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rdtk.pc.in ${CMAKE_CURRENT_BINARY_DIR}/rdtk${RDTK_VERSION_MAJOR}.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rdtk${RDTK_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
-       export(PACKAGE rdtk)
-
-       set(RDTK_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/RdTk${RDTK_VERSION_MAJOR}")
-
-       configure_package_config_file(RdTkConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/RdTkConfig.cmake
-               INSTALL_DESTINATION ${RDTK_CMAKE_INSTALL_DIR} PATH_VARS RDTK_INCLUDE_DIR)
-
-       write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/RdTkConfigVersion.cmake
-               VERSION ${RDTK_VERSION} COMPATIBILITY SameMajorVersion)
-
-       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/RdTkConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/RdTkConfigVersion.cmake
-               DESTINATION ${RDTK_CMAKE_INSTALL_DIR})
-
-       install(EXPORT RdTkTargets DESTINATION ${RDTK_CMAKE_INSTALL_DIR})
-endif()
-

diff --git a/rdtk/RdTkConfig.cmake.in b/rdtk/RdTkConfig.cmake.in
deleted file mode 100644 (file)
index d3e9653..0000000
--- a/rdtk/RdTkConfig.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-
-@PACKAGE_INIT@
-
-set(RdTk_VERSION_MAJOR "@RDTK_VERSION_MAJOR@")
-set(RdTk_VERSION_MINOR "@RDTK_VERSION_MINOR@")
-set(RdTk_VERSION_REVISION "@RDTK_VERSION_REVISION@")
-
-set_and_check(RdTk_INCLUDE_DIR "@PACKAGE_RDTK_INCLUDE_DIR@")
-
-include("${CMAKE_CURRENT_LIST_DIR}/RdTkTargets.cmake")
-

diff --git a/rdtk/include/CMakeLists.txt b/rdtk/include/CMakeLists.txt
deleted file mode 100644 (file)
index a363933..0000000
--- a/rdtk/include/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# RdTk: Remote Desktop Toolkit
-# rdtk cmake build script
-#
-# Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-file(GLOB RDTK_HEADERS "rdtk/*.h")
-install(FILES ${RDTK_HEADERS} DESTINATION include/rdtk${RDTK_VERSION_MAJOR}/rdtk COMPONENT headers)
-

diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt
index 94c8776..000e6d2 100644 (file)
--- a/rdtk/librdtk/CMakeLists.txt
+++ b/rdtk/librdtk/CMakeLists.txt
@@ -17,7 +17,6 @@
 set(MODULE_NAME "rdtk")
 set(MODULE_PREFIX "RDTK")
 
-include_directories(${OPENSSL_INCLUDE_DIR})
 
 set(${MODULE_PREFIX}_SRCS
        rdtk_resources.c
@@ -37,40 +36,19 @@ set(${MODULE_PREFIX}_SRCS
        rdtk_engine.c
        rdtk_engine.h)
 
-# On windows create dll version information.
-# Vendor, product and year are already set in top level CMakeLists.txt
-if (WIN32)
-  set (RC_VERSION_MAJOR ${RDTK_VERSION_MAJOR})
-  set (RC_VERSION_MINOR ${RDTK_VERSION_MINOR})
-  set (RC_VERSION_BUILD ${RDTK_VERSION_REVISION})
-  set (RC_VERSION_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${MODULE_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" )
-
-  configure_file(
-    ${CMAKE_SOURCE_DIR}/cmake/WindowsDLLVersion.rc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-    @ONLY)
-
-  set ( ${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-endif()
-
-add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 
 list(APPEND ${MODULE_PREFIX}_LIBS winpr)
 list(APPEND ${MODULE_PREFIX}_LIBS freerdp)
 
-if (WITH_LIBRARY_VERSIONING)
-       set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${RDTK_VERSION} SOVERSION ${RDTK_API_VERSION})
-endif()
-
 target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
 
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT RdTkTargets)
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-       install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
-endif()
-
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk")
 
 if(BUILD_TESTING)
        add_subdirectory(test)
 endif()
+
+if (NOT BUILD_SHARED_LIBS)
+       install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT FreeRDP-ShadowTargets)
+endif()

diff --git a/rdtk/rdtk.pc.in b/rdtk/rdtk.pc.in
deleted file mode 100644 (file)
index 323916e..0000000
--- a/rdtk/rdtk.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=${prefix}/@RDTK_INCLUDE_DIR@
-libs=-lrdtk
-
-Name: Remote Desktop Tool Kit
-Description: FreeRDP RDTK: A toolkit implementation for RDP
-URL: http://www.freerdp.com/
-Version: @RDTK_VERSION_FULL@
-Requires: 
-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ freerdp@FREERDP_VERSION_MAJOR@
-Libs: -L${libdir} ${libs}
-Libs.private: -ldl -lpthread
-Cflags: -I${includedir}