Update VisualStudio projects to link against Winsock2 instead of Winsock1

[flightgear.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ec1f627ec1cdfd416ae01d6cc62086adea442f5..f8553454e040e954eb0342b45da86ef37ef048fb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,8 @@ option(ENABLE_YASIM "Set to ON to build FlightGear with YASIM FDM" ON)
 option(ENABLE_JSBSIM "Set to ON to build FlightGear with JSBSim FDM" ON)
 option(ENABLE_FGADMIN "Set to ON to build FlightGear with FGADMIN" ON)
 option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" OFF)
-option(ENABLE_LIBSVN "Set to ON to build terrasync with libsvnclient support" OFF)
+option(ENABLE_LIBSVN "Set to ON to build FlightGear/terrasync with libsvnclient support" ON)
+option(WITH_FGPANEL "Set to ON to build the fgpanel application" ON)
 
 set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 
@@ -65,12 +66,13 @@ else()
        set(FG_NDEBUG 1)
 endif()
 
-if(${SP_FDMS})
+if(SP_FDMS)
        set(ENABLE_SP_FDM 1)
 endif()
 
 if(EVENT_INPUT)
        message(STATUS "checking event-based Input")
+       find_package(DBus)
        IF(APPLE)
 
        elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -130,7 +132,7 @@ if(ENABLE_LIBSVN)
 endif(ENABLE_LIBSVN)
 
 find_package(PLIB REQUIRED puaux pu js fnt)
-find_package(SimGear 2.2.0 REQUIRED)
+find_package(SimGear 2.5.0 REQUIRED)
 
 check_include_file(unistd.h HAVE_UNISTD_H)
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
@@ -224,6 +226,8 @@ include_directories(${PROJECT_BINARY_DIR}/src/Include)
 
 add_definitions(-DHAVE_CONFIG_H)
 
+check_function_exists(mkfifo HAVE_MKFIFO)
+
 # configure a header file to pass some of the CMake settings
 # to the source code
 configure_file (