fly/flightgear
1
0
Fork 0
Code Activity

Kill of embedded-Simgear CMake mode.

Browse source 
This was a silly idea, CMake super-builds from fgmeta are the correct
approach to this going forward.
This commit is contained in:
James Turner 2013-09-28 14:17:53 +01:00
parent 97d89a0c47
commit 4bb52e46df
1 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
CMakeLists.txt
View file

@ -243,26 +243,8 @@ list(APPEND SQLITE3_LIBRARY ${CMAKE_THREAD_LIBS_INIT})
find_package(PLIB REQUIRED puaux pu js fnt) find_package(PLIB REQUIRED puaux pu js fnt)
if (EMBEDDED_SIMGEAR) # FlightGear and SimGear versions need to match
message(STATUS "Using embedded SimGear") find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED)
# 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)
############################################################################## ##############################################################################
@ -373,14 +355,6 @@ configure_file (
"${PROJECT_BINARY_DIR}/src/Include/version.h" "${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(3rdparty)
add_subdirectory(utils) add_subdirectory(utils)
add_subdirectory(src) add_subdirectory(src)