From 97d89a0c47b2f3b063200486b2e9b0f1637c32d8 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 28 Sep 2013 14:15:47 +0100 Subject: [PATCH] Remove all references to libsvn from build. --- CMakeLists.txt | 16 +------ CMakeModules/FindSimGear.cmake | 1 - CMakeModules/FindSvnClient.cmake | 80 -------------------------------- src/Include/config_cmake.h.in | 3 -- 4 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 CMakeModules/FindSvnClient.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 809c48c5c..96c693766 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,6 @@ option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" OFF) option(ENABLE_YASIM "Set to ON to build FlightGear with YASIM FDM (default)" ON) option(ENABLE_JSBSIM "Set to ON to build FlightGear with JSBSim FDM (default)" ON) option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" ${EVENT_INPUT_DEFAULT}) -option(ENABLE_LIBSVN "Set to ON to build FlightGear/terrasync with libsvnclient support (default)" ON) option(ENABLE_RTI "Set to ON to build FlightGear with RTI support" OFF) option(ENABLE_PROFILE "Set to ON to build FlightGear with gperftools profiling support" OFF) option(JPEG_FACTORY "Set to ON to build FlightGear with JPEG-factory support" OFF) @@ -224,18 +223,6 @@ if(ENABLE_FGADMIN) endif ( FLTK_FOUND ) endif(ENABLE_FGADMIN) -if(ENABLE_LIBSVN) - find_package(SvnClient) - - if(LIBSVN_FOUND) - message(STATUS "libsvn found, enabling in terrasync") - set(HAVE_SVN_CLIENT_H 1) - set(HAVE_LIBSVN_CLIENT_1 1) - else() - message(STATUS "libsvn missing. Disabling...") - endif(LIBSVN_FOUND) -endif(ENABLE_LIBSVN) - ############################################################################## ## Sqlite3 setup @@ -267,7 +254,6 @@ if (EMBEDDED_SIMGEAR) set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARY} - ${LIBSVN_LIBRARIES} ${WINMM_LIBRARY}) set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES @@ -278,6 +264,8 @@ else(EMBEDDED_SIMGEAR) find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED) endif (EMBEDDED_SIMGEAR) +############################################################################## + if (JPEG_FACTORY) # check simgear was built with JPEG-factory support find_package(JPEG REQUIRED) diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake index c0e14e133..b4aeaf51b 100644 --- a/CMakeModules/FindSimGear.cmake +++ b/CMakeModules/FindSimGear.cmake @@ -146,7 +146,6 @@ else(SIMGEAR_SHARED) set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARY} - ${LIBSVN_LIBRARIES} ${WINMM_LIBRARY}) set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake deleted file mode 100644 index 724dcff5f..000000000 --- a/CMakeModules/FindSvnClient.cmake +++ /dev/null @@ -1,80 +0,0 @@ -# Find Subversion client libraries, and dependencies -# including APR (Apache Portable Runtime) - -include (CheckFunctionExists) -include (CheckIncludeFile) -include (CheckLibraryExists) - -macro(find_static_component comp libs) - # account for alternative Windows svn distribution naming - if(MSVC) - set(compLib "lib${comp}") - else(MSVC) - set(compLib "${comp}") - endif(MSVC) - - string(TOUPPER "${comp}" compLibBase) - set( compLibName ${compLibBase}_LIBRARY ) - - # NO_DEFAULT_PATH is important on Mac - we need to ensure subversion - # libraires in dist/ or Macports are picked over the Apple version - # in /usr, since that's what we will ship. - # On other platforms we do need default paths though, i.e. since Linux - # distros may use architecture-specific directories (like - # /usr/lib/x86_64-linux-gnu) which we cannot hardcode/guess here. - FIND_LIBRARY(${compLibName} -if(APPLE) - NO_DEFAULT_PATH -endif(APPLE) - NAMES ${compLib} - HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib - PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 - PATHS ${ADDITIONAL_LIBRARY_PATHS} - ) - - list(APPEND ${libs} ${${compLibName}}) -endmacro() - -find_program(HAVE_APR_CONFIG apr-1-config) -if(HAVE_APR_CONFIG) - - execute_process(COMMAND apr-1-config --cppflags --includes - OUTPUT_VARIABLE APR_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - - execute_process(COMMAND apr-1-config --link-ld - OUTPUT_VARIABLE RAW_APR_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE) - -# clean up some vars, or other CMake pieces complain - string(STRIP "${RAW_APR_LIBS}" APR_LIBS) - -else(HAVE_APR_CONFIG) - message(STATUS "apr-1-config not found, implement manual search for APR") -endif(HAVE_APR_CONFIG) - -if(HAVE_APR_CONFIG OR MSVC) - find_path(LIBSVN_INCLUDE_DIR svn_client.h - NO_DEFAULT_PATH - HINTS - $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include - PATH_SUFFIXES include/subversion-1 - PATHS ${ADDITIONAL_LIBRARY_PATHS} - ) - - set(LIBSVN_LIBRARIES "") - if (MSVC) - find_static_component("apr-1" LIBSVN_LIBRARIES) - else (MSVC) - list(APPEND LIBSVN_LIBRARIES ${APR_LIBS}) - endif (MSVC) - find_static_component("svn_client-1" LIBSVN_LIBRARIES) - find_static_component("svn_subr-1" LIBSVN_LIBRARIES) - find_static_component("svn_ra-1" LIBSVN_LIBRARIES) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSVN DEFAULT_MSG LIBSVN_LIBRARIES LIBSVN_INCLUDE_DIR) - if(NOT LIBSVN_FOUND) - set(LIBSVN_LIBRARIES "") - endif(NOT LIBSVN_FOUND) -endif(HAVE_APR_CONFIG OR MSVC) diff --git a/src/Include/config_cmake.h.in b/src/Include/config_cmake.h.in index af5115d74..599a3c41d 100644 --- a/src/Include/config_cmake.h.in +++ b/src/Include/config_cmake.h.in @@ -29,9 +29,6 @@ #cmakedefine ENABLE_YASIM #cmakedefine ENABLE_JSBSIM -#cmakedefine HAVE_SVN_CLIENT_H -#cmakedefine HAVE_LIBSVN_CLIENT_1 - #define PKGLIBDIR "@FG_DATA_DIR@" #define WEB_BROWSER "@WEB_BROWSER@"