X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=3b60b851b7425a7f4b45b5720e7f230a7a9fb9c9;hb=2edbb1cf8b627378bb4b1f4b7cadc8cdaf2a04cd;hp=f8c5097c118e1f6fa5a533a5b38e02fc818f7ee9;hpb=99cf0579063441568aaff8842956a56da769721b;p=simgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f8c5097c..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) @@ -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}) @@ -85,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 - /local - /usr/local - /usr) -endif() ##################################################################################### if (NOT MSVC) @@ -106,13 +101,13 @@ 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_SOURCE_DIR} PATH) + GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH) if (CMAKE_CL_64) SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64") else (CMAKE_CL_64) @@ -165,6 +160,10 @@ 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(CORE_SERVICES_LIBRARY CoreServices) +endif() + find_package(Boost REQUIRED) set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION") @@ -177,6 +176,7 @@ else() if (ENABLE_SOUND) find_package(OpenAL REQUIRED) + message(STATUS "Sound support: ENABLED") endif(ENABLE_SOUND) find_package(OpenSceneGraph 3.0.0 REQUIRED osgText osgSim osgDB osgParticle osgGA osgUtil) @@ -190,23 +190,6 @@ 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) @@ -214,12 +197,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) @@ -268,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") @@ -301,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) @@ -313,7 +325,10 @@ if(WIN32) # SET(WARNING_FLAGS "${WARNING_FLAGS} /wd${warning}") # endforeach(warning) - set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250") + set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /wd4996 /wd4250 -Dstrdup=_strdup") + if (${MSVC_VERSION} GREATER 1599) + set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" ) + endif (${MSVC_VERSION} GREATER 1599) endif(MSVC) # assumed on Windows @@ -325,15 +340,17 @@ endif(WIN32) 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) include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${OPENAL_INCLUDE_DIR} ) + ${Boost_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} + ${OPENAL_INCLUDE_DIR} +) add_definitions(-DHAVE_CONFIG_H) @@ -344,22 +361,33 @@ 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() + enable_testing() 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} + ${CORE_SERVICES_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) #----------------------------------------------------------------------------- @@ -371,3 +399,5 @@ CONFIGURE_FILE( IMMEDIATE @ONLY) ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + +