X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=7af05c81f267c4ebbf03fb2514776d9379cc008b;hb=c144c3562cd786f24b8d25444a823eb8ca09995a;hp=854db0c9e4552a186ab57b7696fe0ab6663c0b7d;hpb=fa64f7b6aa8502cd92cdfb3dddfaf2a548eabc64;p=simgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 854db0c9..7af05c81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.6.4) include (CheckFunctionExists) include (CheckIncludeFile) include (CheckCXXSourceCompiles) - +include (CheckCXXCompilerFlag) project(SimGear) @@ -10,6 +10,8 @@ project(SimGear) file(READ version versionFile) string(STRIP ${versionFile} SIMGEAR_VERSION) +set(FIND_LIBRARY_USE_LIB64_PATHS ON) + # use simgear version also as the SO version (if building SOs) SET(SIMGEAR_SOVERSION ${SIMGEAR_VERSION}) @@ -21,33 +23,31 @@ if(InSourceBuild) message(WARNING " mkdir ../sgbuild && cd ../sgbuild && cmake ${CMAKE_SOURCE_DIR}") endif(InSourceBuild) -if (NOT EMBEDDED_SIMGEAR) - #packaging - SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") - SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README") - SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Simulation support libraries for FlightGear and related projects") - SET(CPACK_PACKAGE_VENDOR "The FlightGear project") - SET(CPACK_GENERATOR "TBZ2") - SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_CURRENT_BINARY_DIR};SimGear;ALL;/) +#packaging +SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") +SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Simulation support libraries for FlightGear and related projects") +SET(CPACK_PACKAGE_VENDOR "The FlightGear project") +SET(CPACK_GENERATOR "TBZ2") +SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_CURRENT_BINARY_DIR};SimGear;ALL;/) - # split version string into components, note CMAKE_MATCH_0 is the entire regexp match - string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CPACK_PACKAGE_VERSION ${SIMGEAR_VERSION} ) - set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) - set(CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_2}) - set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3}) +# split version string into components, note CMAKE_MATCH_0 is the entire regexp match +string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CPACK_PACKAGE_VERSION ${SIMGEAR_VERSION} ) +set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1}) +set(CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_2}) +set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3}) - message(STATUS "version is ${CPACK_PACKAGE_VERSION_MAJOR} dot ${CPACK_PACKAGE_VERSION_MINOR} dot ${CPACK_PACKAGE_VERSION_PATCH}") +message(STATUS "version is ${CPACK_PACKAGE_VERSION_MAJOR} dot ${CPACK_PACKAGE_VERSION_MINOR} dot ${CPACK_PACKAGE_VERSION_PATCH}") - set(CPACK_SOURCE_GENERATOR TBZ2) - set(CPACK_SOURCE_PACKAGE_FILE_NAME "simgear-${SIMGEAR_VERSION}" CACHE INTERNAL "tarball basename") - set(CPACK_SOURCE_IGNORE_FILES - "^${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore;Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}") +set(CPACK_SOURCE_GENERATOR TBZ2) +set(CPACK_SOURCE_PACKAGE_FILE_NAME "simgear-${SIMGEAR_VERSION}" CACHE INTERNAL "tarball basename") +set(CPACK_SOURCE_IGNORE_FILES + "^${PROJECT_SOURCE_DIR}/.git;\\\\.gitignore;Makefile.am;~$;${CPACK_SOURCE_IGNORE_FILES}") - message(STATUS "ignoring: ${CPACK_SOURCE_IGNORE_FILES}") - - include (CPack) -endif() +message(STATUS "ignoring: ${CPACK_SOURCE_IGNORE_FILES}") + +include (CPack) # We have some custom .cmake scripts not in the official distribution. set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}") @@ -87,13 +87,6 @@ if(NOT "${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "") message(STATUS "additional library directories: ${ADDITIONAL_LIBRARY_PATHS}") endif() -if(NOT MSVC) - # TBD: are these really necessary? Aren't they considered by cmake automatically? - list(APPEND ADDITIONAL_LIBRARY_PATHS - /opt/local - /usr/local - /usr) -endif() ##################################################################################### if (NOT MSVC) @@ -107,11 +100,10 @@ set(SYSTEM_EXPAT OFF) endif() option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF) -option(JPEG_FACTORY "Enable JPEG-factory support" OFF) -option(ENABLE_LIBSVN "Set to ON to build SimGear with libsvnclient support" ON) option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF) option(ENABLE_TESTS "Set to OFF to disable building SimGear's test applications" ON) option(ENABLE_SOUND "Set to OFF to disable building SimGear's sound support" ON) +option(ENABLE_PKGUTIL "Set to ON to build the sg_pkgutil application (default)" ON) if (MSVC) GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH) @@ -167,6 +159,13 @@ if (MSVC AND MSVC_3RDPARTY_ROOT) set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib) endif (MSVC AND MSVC_3RDPARTY_ROOT) +if(APPLE) + find_library(COCOA_LIBRARY Cocoa) +endif() + +# Somehow this only works if included before searching for Boost... +include(BoostTestTargets) + find_package(Boost REQUIRED) set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION") @@ -182,34 +181,9 @@ else() message(STATUS "Sound support: ENABLED") endif(ENABLE_SOUND) - find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgGA osgUtil) + find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgSim osgDB osgParticle osgGA osgUtil) endif(SIMGEAR_HEADLESS) -if(JPEG_FACTORY) - message(STATUS "JPEG-factory: ENABLED") - find_package(JPEG REQUIRED) - include_directories(${JPEG_INCLUDE_DIR}) -else() - message(STATUS "JPEG-factory: DISABLED") -endif(JPEG_FACTORY) - -if(ENABLE_LIBSVN) - find_package(SvnClient) - - if(LIBSVN_FOUND) - message(STATUS "Subversion client support: ENABLED") - set(HAVE_SVN_CLIENT_H 1) - set(HAVE_LIBSVN_CLIENT_1 1) - else() - # Oops. ENABLE_LIBSVN is ON, but svn is still missing. - # Provide clearly visible warning/hint, so builders know what else they should install (or disable). - message(WARNING "Failed to enable subversion client support. Unable to find required subversion client library. Some features may not be available (scenery download).") - message(WARNING "Install 'libsvn' library/DLL (libsvn-devel/libsvnclient/...). Otherwise disable subversion support (set 'ENABLE_LIBSVN' to 'OFF').") - endif(LIBSVN_FOUND) -else() - message(STATUS "Subversion client support: DISABLED") -endif(ENABLE_LIBSVN) - find_package(ZLIB REQUIRED) find_package(Threads REQUIRED) @@ -217,12 +191,19 @@ if (SYSTEM_EXPAT) message(STATUS "Requested to use system Expat library, forcing SIMGEAR_SHARED to true") set(SIMGEAR_SHARED ON) find_package(EXPAT REQUIRED) - include_directories(${EXPAT_INCLUDE_DIRS}) + else() message(STATUS "Using built-in expat code") - add_definitions(-DHAVE_EXPAT_CONFIG_H) + # XML_STATIC is important to avoid sg_expat_external.h + # declaring symbols as declspec(import) + add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC) + set(EXPAT_INCLUDE_DIRS + ${PROJECT_SOURCE_DIR}/3rdparty/expat + ${PROJECT_BINARY_DIR}/3rdparty/expat) endif(SYSTEM_EXPAT) +include_directories(${EXPAT_INCLUDE_DIRS}) + check_include_file(inttypes.h HAVE_INTTYPES_H) check_include_file(sys/time.h HAVE_SYS_TIME_H) check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H) @@ -271,6 +252,22 @@ if(HAVE_CLOCK_GETTIME) endif(HAVE_RT) endif(HAVE_CLOCK_GETTIME) +set(DL_LIBRARY "") +check_cxx_source_compiles( + "#include + int main(void) { + return 0; + } + " + HAVE_DLFCN_H) + +if(HAVE_DLFCN_H) + check_library_exists(dl dlerror "" HAVE_DL) + if(HAVE_DL) + set(DL_LIBRARY "dl") + endif() +endif() + SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually 'd' on windows") SET(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows") SET(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "add a postfix, usually empty on windows") @@ -304,6 +301,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(WARNING_FLAGS_C "-Wall") endif() +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +# boost goes haywire wrt static asserts + check_cxx_compiler_flag(-Wno-unused-local-typedefs HAS_NOWARN_UNUSED_TYPEDEFS) + if(HAS_NOWARN_UNUSED_TYPEDEFS) + set(WARNING_FLAGS_CXX " ${WARNING_FLAGS_CXX} -Wno-unused-local-typedefs") + endif() +endif() + if(WIN32) if(MINGW) @@ -333,16 +338,16 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") -include_directories(${PROJECT_SOURCE_DIR}) -include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include) -include_directories(${PROJECT_BINARY_DIR}/simgear) -include_directories(${PROJECT_BINARY_DIR}/simgear/xml) +# use BEFORE to ensure local directories are used first, +# ahead of system-installed libs +include_directories(BEFORE ${PROJECT_SOURCE_DIR}) +include_directories(BEFORE ${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include) +include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear) include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} - ${LibArchive_INCLUDE_DIRS} ) add_definitions(-DHAVE_CONFIG_H) @@ -354,44 +359,35 @@ configure_file ( "${PROJECT_BINARY_DIR}/simgear/simgear_config.h" ) -configure_file ( - "${PROJECT_SOURCE_DIR}/simgear/xml/expat_config_cmake.in" - "${PROJECT_BINARY_DIR}/simgear/xml/expat_config.h" -) - if(ENABLE_TESTS) # enable CTest / make test target message(STATUS "Tests: ENABLED") include (Dart) enable_testing() - - if(SIMGEAR_SHARED) - set( TEST_LIBS - SimGearCore) - else() - set( TEST_LIBS - SimGearCore - ${CMAKE_THREAD_LIBS_INIT} - ${ZLIB_LIBRARY} - ${WINSOCK_LIBRARY} - ${RT_LIBRARY}) - endif() - - if(NOT SIMGEAR_HEADLESS) - set( TEST_LIBS - SimGearScene - ${TEST_LIBS} - ${OPENGL_LIBRARIES}) - endif() else() message(STATUS "Tests: DISABLED") endif(ENABLE_TESTS) +# always set TEST_LIBS as it is also used by other tools/applications +set(TEST_LIBS_INTERNAL_CORE + ${CMAKE_THREAD_LIBS_INIT} + ${ZLIB_LIBRARY} + ${WINSOCK_LIBRARY} + ${RT_LIBRARY} + ${DL_LIBRARY} + ${COCOA_LIBRARY}) +set(TEST_LIBS SimGearCore ${TEST_LIBS_INTERNAL_CORE}) + +if(NOT SIMGEAR_HEADLESS) + set(TEST_LIBS SimGearScene ${OPENGL_LIBRARIES} ${TEST_LIBS}) +endif() + install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION include/simgear/) + +add_subdirectory(3rdparty) add_subdirectory(simgear) -if (NOT EMBEDDED_SIMGEAR) #----------------------------------------------------------------------------- ### uninstall target #----------------------------------------------------------------------------- @@ -402,5 +398,4 @@ CONFIGURE_FILE( ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -endif()