]> git.mxchange.org Git - flightgear.git/commitdiff
Kill of embedded-Simgear CMake mode.
authorJames Turner <zakalawe@mac.com>
Sat, 28 Sep 2013 13:17:53 +0000 (14:17 +0100)
committerJames Turner <zakalawe@mac.com>
Sat, 28 Sep 2013 13:17:53 +0000 (14:17 +0100)
This was a silly idea, CMake super-builds from fgmeta are the correct
approach to this going forward.

CMakeLists.txt

index 96c6937666b61420a4b1e26de1ab3dfdfa65753c..3806ea09b47cdbe5d9e2a83cfd3e168a3cb7f8c6 100644 (file)
@@ -243,26 +243,8 @@ list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
 
 find_package(PLIB REQUIRED puaux pu js fnt)
 
-if (EMBEDDED_SIMGEAR)
-    message(STATUS "Using embedded SimGear")
-    # create the same variables that FindSimGear would define
-    set(SIMGEAR_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/simgear)
-    set(SIMGEAR_CORE_LIBRARIES SimGearCore)
-    set(SIMGEAR_LIBRARIES SimGearScene)
-
-    if (NOT SIMGEAR_SHARED)
-        set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES
-            ${CMAKE_THREAD_LIBS_INIT}
-            ${ZLIB_LIBRARY}
-            ${WINMM_LIBRARY})
-
-        set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES 
-            ${OPENAL_LIBRARY})
-    endif()
-else(EMBEDDED_SIMGEAR)
-    # FlightGear and SimGear versions need to match
-    find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
-endif (EMBEDDED_SIMGEAR)
+# FlightGear and SimGear versions need to match
+find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
 
 ##############################################################################
 
@@ -373,14 +355,6 @@ configure_file (
     "${PROJECT_BINARY_DIR}/src/Include/version.h"
 )
 
-if (EMBEDDED_SIMGEAR)
-    add_subdirectory(simgear)
-    # since we build without SimGear installed, we need to
-    # search this path directly to find the generated
-    # simgear_config.h
-    include_directories(${PROJECT_BINARY_DIR}/simgear)
-endif(EMBEDDED_SIMGEAR)
-
 add_subdirectory(3rdparty)
 add_subdirectory(utils)
 add_subdirectory(src)