Fixed lib64 auto-detection (again)

Reverting the "LIB_SUFFIX" change.
Assuming recent change was unintentional (otherwise let me know James! :) ).

diff --git a/CMakeModules/SimGearComponent.cmake b/CMakeModules/SimGearComponent.cmake
index dd7e3309b5fc49c1c2420de2d72456463abbbe96..1c11b855b9d61ccca8a86b813d5bbc568860459d 100644 (file)
--- a/CMakeModules/SimGearComponent.cmake
+++ b/CMakeModules/SimGearComponent.cmake
@@ -16,7 +16,7 @@ macro(simgear_component_common name includePath sourcesList sources headers)
         set(libName "sg${name}")
         add_library(${libName} STATIC ${sources} ${headers})
 
-        install (TARGETS ${libName} ARCHIVE DESTINATION lib${LIB_SUFFIX})
+        install (TARGETS ${libName} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
     
     install (FILES ${headers}  DESTINATION include/simgear/${includePath})

diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index 57f013267f7667d9e59724ff6200c3b9c223b199..364f63910312ff66965d8d900fae377a6b2bff36 100644 (file)
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -54,9 +54,9 @@ if(SIMGEAR_SHARED)
   #  set_property(TARGET SimGearCore PROPERTY PUBLIC_HEADER "${publicHeaders}")
     set_property(TARGET SimGearCore PROPERTY LINKER_LANGUAGE CXX)
     
-    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})                    
-    install(TARGETS SimGearCore LIBRARY DESTINATION lib${LIB_SUFFIX})
-                               
+    target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
+    install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
     if(NOT SIMGEAR_HEADLESS)
         if(LIBSVN_FOUND)
             add_definitions(${APR_CFLAGS})
@@ -86,7 +86,7 @@ if(SIMGEAR_SHARED)
             target_link_libraries(SimGearScene ${LIBSVN_LIBRARIES})
         endif(LIBSVN_FOUND)
                 
-        install(TARGETS SimGearScene LIBRARY DESTINATION lib${LIB_SUFFIX})
+        install(TARGETS SimGearScene LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
    
 endif(SIMGEAR_SHARED)