Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/simgear into next

2017-10-01 21:25:16 +01:00
parent d4198659b7 e5e112c3c2
commit e4b9cbcb80
18 changed files with 746 additions and 82 deletions
@@ -49,7 +49,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
 # add a dependency on the versino file
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS version)

-set(FIND_LIBRARY_USE_LIB64_PATHS ON)
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)

 # use simgear version also as the SO version (if building SOs)
 SET(SIMGEAR_SOVERSION ${SIMGEAR_VERSION})