Merge pull request #5 from llyzs/cmake

Various cmake additions.

.gitignore

@@ -2,6 +2,7 @@
 cmake_install.cmake
 CMakeFiles/
 CMakeCache.txt
+config.h
 
 # Make
 Makefile

CMakeLists.txt

@@ -21,10 +21,16 @@ cmake_minimum_required(VERSION 2.8)
 project(FreeRDP C)
 set(CMAKE_COLOR_MAKEFILE ON)
 
+# Include cmake modules
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(TestBigEndian)
+
 # Include our extra modules
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
 include(AutoVersioning)
+include(ConfigOptions)
 
 # Soname versioning - 0.0.0 since it is not being managed yet
 set(FREERDP_VERSION_MAJOR "0")
@@ -38,16 +44,32 @@ if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+# Include files
+check_include_files(sys/param.h HAVE_SYS_PARAM_H)
+check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
+check_include_files(netdb.h HAVE_NETDB_H)
+check_include_files(fcntl.h HAVE_FCNTL_H)
+
+# Endian
+test_big_endian(BIG_ENDIAN)
+
 # Path to put keymaps
 set(FREERDP_KEYMAP_PATH "${CMAKE_INSTALL_PREFIX}/freerdp/keymaps")
 
+# Include directories
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/include)
+
+# Configure files
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
 # Build CUnit
 find_package(CUnit)
 if(CUNIT_FOUND)
    add_subdirectory(cunit)
 endif()
 
-# Libraries
+# Sub-directories
 add_subdirectory(include)
 add_subdirectory(libfreerdp-asn1)
 add_subdirectory(libfreerdp-utils)

cmake/ConfigOptions.cmake

@@ -0,0 +1 @@
+option(WITH_DEBUG_TRANSPORT "Print transport debug message." OFF)

config.h.in

@@ -0,0 +1,11 @@
+/* Include files */
+#cmakedefine HAVE_SYS_PARAM_H
+#cmakedefine HAVE_SYS_SOCKET_H
+#cmakedefine HAVE_NETDB_H
+#cmakedefine HAVE_FCNTL_H
+
+/* Endian */
+#cmakedefine BIG_ENDIAN
+
+/* Options */
+#cmakedefine WITH_DEBUG_TRANSPORT

cunit/CMakeLists.txt

@@ -19,8 +19,6 @@
 
 include_directories(${CUNIT_INCLUDE_DIRS})
 
-include_directories(.)
-include_directories(../include)
 include_directories(../libfreerdp-core)
 include_directories(../libfreerdp-gdi)
 

freerdp-ui/test/CMakeLists.txt

@@ -17,8 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(.)
-include_directories(../../include)
 include_directories(../../libfreerdp-core)
 
 add_executable(freerdp-test

libfreerdp-asn1/CMakeLists.txt

@@ -17,8 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(.)
-
 set(COMMON_SRCS
 	asn_application.h
 	asn_codecs.h

libfreerdp-core/CMakeLists.txt

@@ -17,10 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(.)
-include_directories(../include)
-
-add_definitions(-DL_ENDIAN=1)
 add_definitions(-DEXT_PATH="/usr/lib/freerdp/extensions")
 
 set(LIBFREERDP_CORE_SRCS

libfreerdp-gdi/CMakeLists.txt

@@ -17,9 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(.)
-include_directories(../include)
-
 set(FREERDP_GDI_SRCS
 	color.c
 	color.h

libfreerdp-kbd/CMakeLists.txt

@@ -17,9 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(.)
-include_directories(../include)
-
 set(FREERDP_KBD_SRCS
 	keyboard.h
 	locales.c

libfreerdp-utils/CMakeLists.txt

@@ -17,9 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(.)
-include_directories(../include)
-
 set(FREERDP_UTILS_SRCS
 	datablob.c
 	hexdump.c