mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 08:24:16 +09:00
Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
This commit is contained in:
Marc-André Moreau
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,5 @@
|
||||
# CMake
|
||||
*.cmake
|
||||
cmake_install.cmake
|
||||
CMakeFiles/
|
||||
CMakeCache.txt
|
||||
|
||||
|
||||
@@ -24,6 +24,8 @@ set(CMAKE_COLOR_MAKEFILE ON)
|
||||
# Include our extra modules
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
|
||||
|
||||
include(AutoVersioning)
|
||||
|
||||
# Soname versioning - 0.0.0 since it is not being managed yet
|
||||
set(FREERDP_VERSION_MAJOR "0")
|
||||
set(FREERDP_VERSION_MINOR "0")
|
||||
@@ -39,8 +41,13 @@ endif()
|
||||
# Path to put keymaps
|
||||
set(FREERDP_KEYMAP_PATH "${CMAKE_INSTALL_PREFIX}/freerdp/keymaps")
|
||||
|
||||
# Build CUnit
|
||||
find_package(CUnit)
|
||||
if(CUNIT_FOUND)
|
||||
add_subdirectory(cunit)
|
||||
endif()
|
||||
|
||||
# Libraries
|
||||
add_subdirectory(cunit)
|
||||
add_subdirectory(include)
|
||||
add_subdirectory(libfreerdp-asn1)
|
||||
add_subdirectory(libfreerdp-utils)
|
||||
|
||||
54
cmake/AutoVersioning.cmake
Normal file
54
cmake/AutoVersioning.cmake
Normal file
@@ -0,0 +1,54 @@
|
||||
# - AutoVersioning
|
||||
# Gather version from tarball or SCM
|
||||
#
|
||||
# This module defines the following variables:
|
||||
# PRODUCT_VERSION - Version of product
|
||||
#
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2011 O.S. Systems Software Ltda.
|
||||
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
|
||||
#
|
||||
# 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.
|
||||
#=============================================================================
|
||||
|
||||
if(EXISTS "${CMAKE_SOURCE_DIR}/.version" )
|
||||
file(READ ${CMAKE_SOURCE_DIR}/.version PRODUCT_VERSION)
|
||||
|
||||
string(STRIP ${PRODUCT_VERSION} PRODUCT_VERSION)
|
||||
else()
|
||||
execute_process(COMMAND git describe --match "v[0-9]*" --abbrev=4
|
||||
OUTPUT_VARIABLE PRODUCT_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET)
|
||||
|
||||
if(PRODUCT_VERSION)
|
||||
string(REGEX REPLACE "^v(.*)" "\\1" PRODUCT_VERSION ${PRODUCT_VERSION})
|
||||
else()
|
||||
# GIT is the default version
|
||||
set(PRODUCT_VERSION GIT)
|
||||
endif()
|
||||
|
||||
# Check if has not commited changes
|
||||
execute_process(COMMAND git update-index -q --refresh)
|
||||
execute_process(COMMAND git diff-index --name-only HEAD --
|
||||
OUTPUT_VARIABLE CHANGED_SOURCE
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET)
|
||||
|
||||
if(CHANGED_SOURCE)
|
||||
set(PRODUCT_VERSION ${PRODUCT_VERSION}-dirty)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
message(STATUS "${CMAKE_PROJECT_NAME} ${PRODUCT_VERSION}")
|
||||
47
cmake/FindCUnit.cmake
Normal file
47
cmake/FindCUnit.cmake
Normal file
@@ -0,0 +1,47 @@
|
||||
# - Find CUnit
|
||||
# Find the CUnit libraries
|
||||
#
|
||||
# This module defines the following variables:
|
||||
# CUNIT_FOUND - True if CUNIT_INCLUDE_DIR & CUNIT_LIBRARY are found
|
||||
# CUNIT_LIBRARIES - Set when CUNIT_LIBRARY is found
|
||||
# CUNIT_INCLUDE_DIRS - Set when CUNIT_INCLUDE_DIR is found
|
||||
#
|
||||
# CUNIT_INCLUDE_DIR - where to find CUnit.h, etc.
|
||||
# CUNIT_LIBRARY - the cunit library
|
||||
#
|
||||
|
||||
#=============================================================================
|
||||
# Copyright 2011 O.S. Systems Software Ltda.
|
||||
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
|
||||
#
|
||||
# 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.
|
||||
#=============================================================================
|
||||
|
||||
find_path(CUNIT_INCLUDE_DIR NAMES CUnit.h
|
||||
PATH_SUFFIXES CUnit
|
||||
DOC "The CUnit include directory"
|
||||
)
|
||||
|
||||
find_library(CUNIT_LIBRARY NAMES cunit
|
||||
DOC "The CUnit library"
|
||||
)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CUNIT DEFAULT_MSG CUNIT_LIBRARY CUNIT_INCLUDE_DIR)
|
||||
|
||||
if(CUNIT_FOUND)
|
||||
set( CUNIT_LIBRARIES ${CUNIT_LIBRARY} )
|
||||
set( CUNIT_INCLUDE_DIRS ${CUNIT_INCLUDE_DIR} )
|
||||
endif()
|
||||
|
||||
mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)
|
||||
@@ -17,6 +17,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include_directories(${CUNIT_INCLUDE_DIRS})
|
||||
|
||||
include_directories(.)
|
||||
include_directories(../include)
|
||||
include_directories(../libfreerdp-gdi)
|
||||
@@ -31,7 +33,7 @@ add_executable(test_freerdp
|
||||
test_freerdp.c
|
||||
test_freerdp.h)
|
||||
|
||||
target_link_libraries(test_freerdp cunit)
|
||||
target_link_libraries(test_freerdp ${CUNIT_LIBRARIES})
|
||||
|
||||
target_link_libraries(test_freerdp freerdp-gdi)
|
||||
target_link_libraries(test_freerdp freerdp-asn1)
|
||||
|
||||
Reference in New Issue
Block a user