X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=CMakeLists.txt;h=7bf7503970134c8e7baaf653690d82db2caf1444;hb=a563cfd0f2a5e68ad0eab1a371b141fab4ddd59e;hp=07363346e9bce01f0ed44c5e5ca48ac790beb3e5;hpb=7a52c2fa71355631a559d74e0860fa6c5efa424e;p=simgear.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 07363346..7bf75039 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,9 @@ project(SimGear) file(READ version versionFile) string(STRIP ${versionFile} SIMGEAR_VERSION) +# use simgear version also as the SO version (if building SOs) +SET(SIMGEAR_SOVERSION ${SIMGEAR_VERSION}) + #packaging SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README") @@ -164,18 +167,15 @@ if(HAVE_UNISTD_H) int main() { return 0; } " - HAVE_CLOCK_GETTIME) + HAVE_CLOCK_GETTIME) endif(HAVE_UNISTD_H) set(RT_LIBRARY "") if(HAVE_CLOCK_GETTIME) - check_function_exists(clock_gettime CLOCK_GETTIME_IN_LIBC) - if(NOT CLOCK_GETTIME_IN_LIBC) - check_library_exists(rt clock_gettime "" HAVE_RT) - if(HAVE_RT) - set(RT_LIBRARY rt) - endif(HAVE_RT) - endif(NOT CLOCK_GETTIME_IN_LIBC) + check_library_exists(rt clock_gettime "" HAVE_RT) + if(HAVE_RT) + set(RT_LIBRARY rt) + endif(HAVE_RT) endif(HAVE_CLOCK_GETTIME) SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually 'd' on windows") @@ -218,6 +218,10 @@ if(WIN32) set( RT_LIBRARY "winmm" ) endif(WIN32) +if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set (WARNING_FLAGS "-Wall -Wno-overloaded-virtual") +endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")