Ugly hack to detect the presence of fl_filename_free_list without relying on cmake...

[flightgear.git] / CMakeModules / FindPLIB.cmake

diff --git a/CMakeModules/FindPLIB.cmake b/CMakeModules/FindPLIB.cmake
index 1fe81b200d5940f3e7f100f191775a8b1d4141f3..685c54d63e3589e38ad1d92474c0e3b9bf15bb5d 100644 (file)
--- a/CMakeModules/FindPLIB.cmake
+++ b/CMakeModules/FindPLIB.cmake
@@ -89,7 +89,7 @@ macro(find_static_component comp libs)
 
     FIND_LIBRARY(${compLibName}_DEBUG
       NAMES ${compLib}_d
-      HINTS $ENV{SIMGEAR_DIR}
+      HINTS $ENV{PLIBDIR}
       PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
       PATHS
       /usr/local
@@ -98,7 +98,7 @@ macro(find_static_component comp libs)
     )
     FIND_LIBRARY(${compLibName}_RELEASE
       NAMES ${compLib}
-      HINTS $ENV{SIMGEAR_DIR}
+      HINTS $ENV{PLIBDIR}
       PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
       PATHS
       /usr/local
@@ -161,7 +161,7 @@ if(${haveJs} GREATER -1)
         find_library(CF_LIBRARY CoreFoundation)
         set(JS_LIBS ${IOKIT_LIBRARY} ${CF_LIBRARY})
     elseif(WIN32)
-        find_library(WINMM_LIBRARY winmm)
+        set(WINMM_LIBRARY winmm)
         set(JS_LIBS ${WINMM_LIBRARY})
     elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
         # anything needed here?