morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

wfreerdp: fix target exporting

Browse Source
This commit is contained in:
Marc-André Moreau
2014-02-02 22:37:54 -05:00
parent b5bef07e50
commit 17665378a9
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CMakeLists.txt
View File

@@ -214,30 +214,30 @@ if(IOS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot ${CMAKE_IOS_SDK_ROOT} -g") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot ${CMAKE_IOS_SDK_ROOT} -g")
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINPR_EXPORTS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFREERDP_EXPORTS") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFREERDP_EXPORTS")
# Include files # Include files
if(NOT IOS) if(NOT IOS)
check_include_files(fcntl.h HAVE_FCNTL_H) check_include_files(fcntl.h HAVE_FCNTL_H)
check_include_files(unistd.h HAVE_UNISTD_H) check_include_files(unistd.h HAVE_UNISTD_H)
check_include_files(stdint.h HAVE_STDINT_H) check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(inttypes.h HAVE_INTTYPES_H) check_include_files(inttypes.h HAVE_INTTYPES_H)
check_include_files(sys/modem.h HAVE_SYS_MODEM_H) check_include_files(sys/modem.h HAVE_SYS_MODEM_H)
check_include_files(sys/filio.h HAVE_SYS_FILIO_H) check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H) check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H)
check_include_files(sys/select.h HAVE_SYS_SELECT_H) check_include_files(sys/select.h HAVE_SYS_SELECT_H)
else() else()
set(HAVE_FCNTL_H 1) set(HAVE_FCNTL_H 1)
set(HAVE_UNISTD_H 1) set(HAVE_UNISTD_H 1)
set(HAVE_STDINT_H 1) set(HAVE_STDINT_H 1)
set(HAVE_INTTYPES_H 1) set(HAVE_INTTYPES_H 1)
set(HAVE_SYS_FILIO_H 1) set(HAVE_SYS_FILIO_H 1)
endif() endif()
if(NOT IOS) if(NOT IOS)
check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF) check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
else() else()
set(HAVE_TM_GMTOFF 1) set(HAVE_TM_GMTOFF 1)
endif() endif()
# Mac OS X # Mac OS X
@@ -315,10 +315,11 @@ if(NOT IOS AND NOT ANDROID)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
endif() endif()
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) if(NOT WIN32)
check_library_exists(pthread pthread_tryjoin_np "" HAVE_PTHREAD_GNU_EXT) list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) check_library_exists(pthread pthread_tryjoin_np "" HAVE_PTHREAD_GNU_EXT)
list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
endif()
if(UNIX OR CYGWIN) if(UNIX OR CYGWIN)
check_include_files(sys/eventfd.h HAVE_AIO_H) check_include_files(sys/eventfd.h HAVE_AIO_H)
@@ -433,9 +434,7 @@ endif()
find_feature(X11 ${X11_FEATURE_TYPE} ${X11_FEATURE_PURPOSE} ${X11_FEATURE_DESCRIPTION}) find_feature(X11 ${X11_FEATURE_TYPE} ${X11_FEATURE_PURPOSE} ${X11_FEATURE_DESCRIPTION})
find_feature(DirectFB ${DIRECTFB_FEATURE_TYPE} ${DIRECTFB_FEATURE_PURPOSE} ${DIRECTFB_FEATURE_DESCRIPTION}) find_feature(DirectFB ${DIRECTFB_FEATURE_TYPE} ${DIRECTFB_FEATURE_PURPOSE} ${DIRECTFB_FEATURE_DESCRIPTION})
if (${WITH_DIRECTFB}) if (${WITH_DIRECTFB})
message(WARNING " message(WARNING "DIRECTFB is orphaned and not maintained see docs/README.directfb for details")
DIRECTFB is orphaned and not maintained see docs/README.directfb for details
")
endif() endif()
find_feature(ZLIB ${ZLIB_FEATURE_TYPE} ${ZLIB_FEATURE_PURPOSE} ${ZLIB_FEATURE_DESCRIPTION}) find_feature(ZLIB ${ZLIB_FEATURE_TYPE} ${ZLIB_FEATURE_PURPOSE} ${ZLIB_FEATURE_DESCRIPTION})
@@ -463,7 +462,7 @@ if(TARGET_ARCH MATCHES "x86|x64")
endif() endif()
# Installation Paths # Installation Paths
if(WIN32) if(WIN32 AND NOT FREERDP_SDK)
set(CMAKE_INSTALL_BINDIR ".") set(CMAKE_INSTALL_BINDIR ".")
set(CMAKE_INSTALL_LIBDIR ".") set(CMAKE_INSTALL_LIBDIR ".")
endif() endif()

2
client/Windows/CMakeLists.txt
View File

@@ -63,7 +63,7 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
if(WITH_CLIENT_INTERFACE) if(WITH_CLIENT_INTERFACE)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
add_subdirectory(cli) add_subdirectory(cli)
else() else()
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)

7
winpr/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ project(WinPR C)
set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_COLOR_MAKEFILE ON)
if(FREERDP_VERSION) if(FREERDP_VERSION)
set(FREERDP_BUILD) set(FREERDP_BUILD 1)
endif() endif()
# Include cmake modules # Include cmake modules
@@ -37,12 +37,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/)
# Check for cmake compatibility (enable/disable features) # Check for cmake compatibility (enable/disable features)
include(CheckCmakeCompat) include(CheckCmakeCompat)
include(FindFeature) include(FindFeature)
include(ComplexLibrary)
include(AutoVersioning) include(AutoVersioning)
include(ConfigOptions) include(ConfigOptions)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(GNUInstallDirsWrapper) include(GNUInstallDirsWrapper)
include(CMakePackageConfigHelpers)
# Soname versioning # Soname versioning
set(WINPR_VERSION_MAJOR "1") set(WINPR_VERSION_MAJOR "1")
@@ -61,6 +62,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
set(BUILD_SHARED_LIBS ON) set(BUILD_SHARED_LIBS ON)
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINPR_EXPORTS")
if(FREERDP_BUILD) if(FREERDP_BUILD)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include PARENT_SCOPE) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include PARENT_SCOPE)

2
winpr/libwinpr/crypto/CMakeLists.txt
View File

@@ -45,8 +45,6 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MODULE winpr MODULE winpr
MODULES winpr-crt winpr-utils) MODULES winpr-crt winpr-utils)
message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES} ZLIB_LIBRARIES: ${ZLIB_LIBRARIES}")
if(WIN32) if(WIN32)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} crypt32) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} crypt32)
endif() endif()