X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=3b60b851b7425a7f4b45b5720e7f230a7a9fb9c9;hb=2edbb1cf8b627378bb4b1f4b7cadc8cdaf2a04cd;hp=f0c85d8be556d6afaf4dca29fa9a866d1eae17b7;hpb=d263334030cee35a84248867a7facf51a3f1abe4;p=simgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f0c85d8b..3b60b851 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) @@ -23,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}") @@ -89,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) @@ -110,8 +101,6 @@ endif() option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF) option(JPEG_FACTORY "Enable JPEG-factory support" OFF) -option(SG_SVN_CLIENT "Set to ON to build SimGear with built-in SVN 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) @@ -201,25 +190,6 @@ else() message(STATUS "JPEG-factory: DISABLED") endif(JPEG_FACTORY) -if (SG_SVN_CLIENT) - message(STATUS "Using built-in subversion client code") -elseif(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(SG_SVN_CLIENT) - find_package(ZLIB REQUIRED) find_package(Threads REQUIRED) @@ -288,6 +258,20 @@ 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) + set(DL_LIBRARY "dl") +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") @@ -321,6 +305,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) @@ -358,7 +350,6 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR} - ${LibArchive_INCLUDE_DIRS} ) add_definitions(-DHAVE_CONFIG_H) @@ -381,25 +372,17 @@ else() endif(ENABLE_TESTS) # always set TEST_LIBS as it is also used by other tools/applications -# TODO maybe better rename? -if(SIMGEAR_SHARED) - set( TEST_LIBS - SimGearCore) -else() - set( TEST_LIBS - SimGearCore - ${CMAKE_THREAD_LIBS_INIT} - ${ZLIB_LIBRARY} - ${WINSOCK_LIBRARY} - ${RT_LIBRARY} - ${CORE_SERVICES_LIBRARY}) -endif() +set(TEST_LIBS_INTERNAL_CORE + ${CMAKE_THREAD_LIBS_INIT} + ${ZLIB_LIBRARY} + ${WINSOCK_LIBRARY} + ${RT_LIBRARY} + ${DL_LIBRARY} + ${CORE_SERVICES_LIBRARY}) +set(TEST_LIBS SimGearCore ${TEST_LIBS_INTERNAL_CORE}) if(NOT SIMGEAR_HEADLESS) - set( TEST_LIBS - SimGearScene - ${TEST_LIBS} - ${OPENGL_LIBRARIES}) + set(TEST_LIBS SimGearScene ${OPENGL_LIBRARIES} ${TEST_LIBS}) endif() install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION include/simgear/) @@ -407,7 +390,6 @@ install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION inclu add_subdirectory(3rdparty) add_subdirectory(simgear) -if (NOT EMBEDDED_SIMGEAR) #----------------------------------------------------------------------------- ### uninstall target #----------------------------------------------------------------------------- @@ -418,5 +400,4 @@ CONFIGURE_FILE( ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -endif()