fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of git://gitorious.org/fg/flightgear into next

Browse source
This commit is contained in:
Erik Hofman 2011-09-11 13:20:54 +02:00
commit b175d8f1ac
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeModules/FindSimGear.cmake
View file

@ -159,7 +159,7 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
${ZLIB_LIBRARY}) ${ZLIB_LIBRARY})
if(WIN32) if(WIN32)
list(APPEND SIMGEAR_CORE_LIBRARY_DEPENDENCIES ${WINSOCK_LIBRARY}) list(APPEND SIMGEAR_CORE_LIBRARY_DEPENDENCIES ws2_32.lib)
endif(WIN32) endif(WIN32)
if(NOT MSVC) if(NOT MSVC)

2
CMakeModules/FindSvnClient.cmake
View file

@ -16,7 +16,7 @@ if(HAVE_APR_CONFIG)
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
# clean up some vars, or other CMake pieces complain # clean up some vars, or other CMake pieces complain
string(STRIP ${RAW_APR_LIBS} APR_LIBS) string(STRIP "${RAW_APR_LIBS}" APR_LIBS)
else(HAVE_APR_CONFIG) else(HAVE_APR_CONFIG)
message(STATUS "apr-1-config not found, implement manual search for APR") message(STATUS "apr-1-config not found, implement manual search for APR")