From 6780a0c8d4f5a9b37d8d8d0aac3cef948c12f6c2 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 30 Nov 2011 19:50:09 +0100 Subject: [PATCH] Fixed lib64 auto-detection (again) Reverting the "LIB_SUFFIX" change. Assuming recent change was unintentional (otherwise let me know James! :) ). --- CMakeModules/SimGearComponent.cmake | 2 +- simgear/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeModules/SimGearComponent.cmake b/CMakeModules/SimGearComponent.cmake index dd7e3309..1c11b855 100644 --- 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 57f01326..364f6391 100644 --- 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)