"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
flightgear-2020.1.1.tar.bz2 and flightgear-2020.1.2.tar.bz2

About: FlightGear is a multi-platform, cooperative flight simulator development project.

CMakeLists.txt  (flightgear-2020.1.1.tar.bz2):CMakeLists.txt  (flightgear-2020.1.2.tar.bz2)
skipping to change at line 318 skipping to change at line 318
osgDB osgDB
osgParticle osgParticle
osgFX osgFX
osgUtil osgUtil
osgViewer osgViewer
osgGA osgGA
) )
find_package(sentry QUIET) find_package(sentry QUIET)
set(sentry_api_key $ENV{FLIGHTGEAR_SENTRY_API_KEY})
if (TARGET sentry::sentry) if (TARGET sentry::sentry)
message(STATUS "Sentry.io crash reporting enabled") if (NOT sentry_api_key)
set(HAVE_SENTRY 1) message(STATUS "Sentry.io crash reporting detected, but FLIGHTGEAR_SENTR
Y_API_KEY not set")
else()
message(STATUS "Sentry.io crash reporting enabled")
set(HAVE_SENTRY 1)
endif()
endif() endif()
#if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") #if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
# include_directories("${CMAKE_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/in clude") # include_directories("${CMAKE_SOURCE_DIR}/3rdparty/iaxclient/lib/libspeex/in clude")
#endif() #endif()
############################################################################## ##############################################################################
## Sqlite3 setup ## Sqlite3 setup
if (SYSTEM_SQLITE) if (SYSTEM_SQLITE)
skipping to change at line 472 skipping to change at line 477
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Ap pleClang" ) if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Ap pleClang" )
set(WARNING_FLAGS_CXX "-Wall -Wno-overloaded-virtual \ set(WARNING_FLAGS_CXX "-Wall -Wno-overloaded-virtual \
-Wno-redeclared-class-member \ -Wno-redeclared-class-member \
-Wno-inconsistent-missing-override \ -Wno-inconsistent-missing-override \
-Wno-unused-local-typedef") -Wno-unused-local-typedef")
if (CMAKE_VERSION VERSION_LESS 3.1) if (CMAKE_VERSION VERSION_LESS 3.1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif() endif()
if (CMAKE_BUILD_TYPE STREQUAL "Debug") # disabled by James - these cause weridness for multi-config generators
set(CMAKE_C_FLAGS # since they set thge flags for all configurations
"${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions") # need to find a better way to adjust these
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions") # if (CMAKE_BUILD_TYPE STREQUAL "Debug")
endif() # set(CMAKE_C_FLAGS
# "${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
# set(CMAKE_CXX_FLAGS
# "${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions"
)
# endif()
# override CMake default RelWithDebInfo flags.
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
if (ENABLE_SIMD) if (ENABLE_SIMD)
if (X86 OR X86_64) if (X86 OR X86_64)
set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftr ee-slp-vectorize") set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftr ee-slp-vectorize")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -f tree-slp-vectorize") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -f tree-slp-vectorize")
# propogate to the RelWithDebInfo flags
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g -DNDEB
UG")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g -DNDEBUG")
endif() endif()
endif() endif()
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set(WARNING_FLAGS_C "-Wall") set(WARNING_FLAGS_C "-Wall")
endif() endif()
if(WIN32) if(WIN32)
 End of changes. 4 change blocks. 
8 lines changed or deleted 28 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)