FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed lib64 auto-detection (again)

Browse Source 
Reverting the "LIB_SUFFIX" change.
Assuming recent change was unintentional (otherwise let me know James! :) ).
This commit is contained in:
ThorstenB 2011-11-30 19:50:09 +01:00
parent fee652d54a
commit 6780a0c8d4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/SimGearComponent.cmake
View File

@ -16,7 +16,7 @@ macro(simgear_component_common name includePath sourcesList sources headers)
set(libName "sg${name}") set(libName "sg${name}")
add_library(${libName} STATIC ${sources} ${headers}) add_library(${libName} STATIC ${sources} ${headers})
install (TARGETS ${libName} ARCHIVE DESTINATION lib${LIB_SUFFIX}) install (TARGETS ${libName} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()
install (FILES ${headers} DESTINATION include/simgear/${includePath}) install (FILES ${headers} DESTINATION include/simgear/${includePath})

8
simgear/CMakeLists.txt
View File

@ -54,9 +54,9 @@ if(SIMGEAR_SHARED)
# set_property(TARGET SimGearCore PROPERTY PUBLIC_HEADER "${publicHeaders}") # set_property(TARGET SimGearCore PROPERTY PUBLIC_HEADER "${publicHeaders}")
set_property(TARGET SimGearCore PROPERTY LINKER_LANGUAGE CXX) set_property(TARGET SimGearCore PROPERTY LINKER_LANGUAGE CXX)
target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY}) target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
install(TARGETS SimGearCore LIBRARY DESTINATION lib${LIB_SUFFIX}) install(TARGETS SimGearCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(NOT SIMGEAR_HEADLESS) if(NOT SIMGEAR_HEADLESS)
if(LIBSVN_FOUND) if(LIBSVN_FOUND)
add_definitions(${APR_CFLAGS}) add_definitions(${APR_CFLAGS})
@ -86,7 +86,7 @@ if(SIMGEAR_SHARED)
target_link_libraries(SimGearScene ${LIBSVN_LIBRARIES}) target_link_libraries(SimGearScene ${LIBSVN_LIBRARIES})
endif(LIBSVN_FOUND) endif(LIBSVN_FOUND)
install(TARGETS SimGearScene LIBRARY DESTINATION lib${LIB_SUFFIX}) install(TARGETS SimGearScene LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()
endif(SIMGEAR_SHARED) endif(SIMGEAR_SHARED)