diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73c0445..169f461 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,65 +1,41 @@
-cmake_minimum_required (VERSION 2.6.4)
+cmake_minimum_required (VERSION 2.8.0)
include (ExternalProject)
project(FlightGear-Meta)
-if(NOT CMAKE_INSTALL_PREFIX)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
- message(STATUS "Default install dir to ${CMAKE_INSTALL_PREFIX}")
-endif()
-
-if (UNIX)
- set(BOOST_BOOTSTRAP "./bootstrap.sh" --prefix=${CMAKE_INSTALL_PREFIX})
-else()
- set(BOOST_BOOTSTRAP "bootstrap.bat")
+ message(STATUS "Default install dir set to ${CMAKE_INSTALL_PREFIX}")
endif()
set(SG_DEPS OSG)
set(FG_DEPS SimGear)
set(SG_CMAKE_ARGS "")
set(FG_CMAKE_ARGS "")
-set(FGRUN_CMAKE_ARGS "")
-if(APPLE)
- set(BOOST_ARGS link=static stage --with-system)
- ExternalProject_Add(Boost
- PREFIX ${CMAKE_BINARY_DIR}
- SVN_REPOSITORY http://svn.boost.org/svn/boost/tags/release/Boost_1_52_0
- UPDATE_COMMAND ${BOOST_BOOTSTRAP}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ./bjam ${BOOST_ARGS}
- BUILD_IN_SOURCE 1
- INSTALL_COMMAND ./b2 install ${BOOST_ARGS})
-
- list(APPEND SG_DEPS Boost)
-endif() # of Apple
set(OSG_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(SG_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(FG_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(PLIB_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set(RTI_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-set(FGRUN_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+
# OpenSceneGraph configuration
-set(OSG_SOURCE http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.0.zip)
+#set(OSG_SOURCE http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.0.zip)
+set(OSG_SOURCE https://github.com/openscenegraph/osg.git)
+set(OSG_TAG OpenSceneGraph-3.2)
if (APPLE)
- set(SDKROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk)
- # force disable Qt and Jasper, and ensure an SDKROOT is set, or
- # osgViewer system detection goes wrongh
- set(OSG_CMAKE_ARGS -DCMAKE_OSX_SYSROOT=${SDKROOT}
+ # force disable Qt and Jasper
+ set(OSG_CMAKE_ARGS
-DOSG_USE_QT=0
-DJASPER_LIBRARY=
- -DSDL_LIBRARY:FILEPATH=
- -DCMAKE_OSX_ARCHITECTURES=x86_64
- -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7
)
# OSG with some patches applied for Mac
- # set(OSG_SOURCE GIT_REPOSITORY git://gitorious.org/+flightgear-developers/openscenegraph/mac-release-osg.git)
- # set(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.0.zip)
-
+ set(OSG_SOURCE https://github.com/zakalawe/osg.git)
+ set(OSG_TAG fgfs-osg-32)
elseif(MSVC)
set(OSG_MSVC "msvc")
if (${MSVC_VERSION} EQUAL 1700)
@@ -104,61 +80,28 @@ else()
# normal OSG
endif()
-if (MSVC)
- # download 3rdparty dependencies zip, including boost
- ExternalProject_Add(WinDeps
- SVN_REPOSITORY http://fgfs.goneabitbursar.com/fgwin3rdparty/trunk/msvc100/${RDPARTY_DIR}
- # extract to current root
- SOURCE_DIR ${CMAKE_BINARY_DIR}/winDeps/${RDPARTY_DIR}
- BINARY_DIR ${CMAKE_BINARY_DIR}
- UPDATE_COMMAND ""
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ${CMAKE_SOURCE_DIR}/installWinDeps.bat
- INSTALL_COMMAND ""
- )
-
- set(BOOST_ARGS link=static stage --with-system)
- set(Boost_Version 1.54.0)
- string(REPLACE "." "_" Boost_Version_Underscore ${Boost_Version})
- ExternalProject_Add(Boost
- PREFIX ${CMAKE_BINARY_DIR}
- URL http://downloads.sourceforge.net/project/boost/boost/${Boost_Version}/boost_${Boost_Version_Underscore}.zip
- URL_MD5 78a35834c45220a6164310e280abe675
- UPDATE_COMMAND ""
- CONFIGURE_COMMAND ${BOOST_BOOTSTRAP}
- BUILD_COMMAND bjam --with-program_options ${BOOST_ARGS}
- BUILD_IN_SOURCE 1
- INSTALL_COMMAND ""
- )
-
- list(APPEND SG_DEPS Boost)
- list(APPEND SG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)
- list(APPEND FG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)
- list(APPEND FG_CMAKE_ARGS -DPNG_LIBRARY=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/lib/libpng16.lib)
- list(APPEND FGRUN_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR}/src/Boost)
-endif(MSVC) # of Windows
ExternalProject_Add(OSG
DEPENDS ${OSG_DEPS}
PREFIX ${CMAKE_BINARY_DIR}
- URL ${OSG_SOURCE}
- URL_HASH MD5=4980f8692712a24d4c99f363f80c6814
+ GIT_REPOSITORY ${OSG_SOURCE}
+ GIT_TAG ${OSG_TAG}
BINARY_DIR osgbuild
CMAKE_ARGS ${OSG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${OSG_INSTALL_PREFIX}
)
# Because OSG install the libraries in lib64/ instead of lib/
+
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
ExternalProject_Add_Step(OSG after_install
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${OSG_INSTALL_PREFIX}/lib64 ${OSG_INSTALL_PREFIX}/lib
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${OSG_INSTALL_PREFIX}/lib64
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${OSG_INSTALL_PREFIX}/lib64 ${OSG_INSTALL_PREFIX}/lib
DEPENDEES install
)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+endif()
# FIXME install of OpenRTI is failing on Windows, files in PREFIX/share which
# are ending up in C:/Program Files/OpenRTI
-if (NOT MSVC)
+if (FALSE)
ExternalProject_Add(OpenRTI
PREFIX ${CMAKE_BINARY_DIR}
DOWNLOAD_COMMAND GIT_REPOSITORY git://gitorious.org/openrti/openrti.git
@@ -205,23 +148,6 @@ if (NOT WIN32)
list(APPEND FG_DEPS PLIB)
endif()
-# Only compile FGRun for Windows
-if (MSVC)
- list(APPEND FGRUN_CMAKE_ARGS -DMSVC_3RDPARTY_ROOT:PATH=${CMAKE_BINARY_DIR})
- list(APPEND FGRUN_CMAKE_ARGS -DFLTK_FLUID_EXECUTABLE:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/bin/fluid.exe)
- list(APPEND FGRUN_CMAKE_ARGS -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH==${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/bin/msgfmt.exe)
- list(APPEND FGRUN_CMAKE_ARGS -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=${CMAKE_BINARY_DIR}/${RDPARTY_DIR}/bin/msgmerge.exe)
- ExternalProject_Add(FGRun
- PREFIX ${CMAKE_BINARY_DIR}
- DEPENDS ${FG_DEPS}
- DOWNLOAD_COMMAND "" # no need to download
- UPDATE_COMMAND "" # or update.
- SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/fgrun
- BINARY_DIR fgrunbuild
- CMAKE_ARGS ${FGRUN_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FGRUN_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${OSG_INSTALL_PREFIX} -DADDITIONAL_LIBRARY_PATHS=${SG_INSTALL_PREFIX}
- )
-endif()
-
ExternalProject_Add(FlightGear
PREFIX ${CMAKE_BINARY_DIR}
DEPENDS ${FG_DEPS}