|
@@ -6,7 +6,7 @@ function(serenity_install_headers target_name)
|
|
file(GLOB_RECURSE headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
|
|
file(GLOB_RECURSE headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
|
|
foreach(header ${headers})
|
|
foreach(header ${headers})
|
|
get_filename_component(subdirectory ${header} DIRECTORY)
|
|
get_filename_component(subdirectory ${header} DIRECTORY)
|
|
- install(FILES ${header} DESTINATION usr/include/${target_name}/${subdirectory} OPTIONAL)
|
|
|
|
|
|
+ install(FILES ${header} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${target_name}/${subdirectory}" OPTIONAL)
|
|
endforeach()
|
|
endforeach()
|
|
endfunction()
|
|
endfunction()
|
|
|
|
|
|
@@ -39,7 +39,7 @@ function(serenity_lib target_name fs_name)
|
|
add_library(${target_name} SHARED ${SOURCES} ${GENERATED_SOURCES})
|
|
add_library(${target_name} SHARED ${SOURCES} ${GENERATED_SOURCES})
|
|
set_target_properties(${target_name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
|
|
set_target_properties(${target_name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
|
|
set_target_properties(${target_name} PROPERTIES VERSION "serenity")
|
|
set_target_properties(${target_name} PROPERTIES VERSION "serenity")
|
|
- install(TARGETS ${target_name} DESTINATION usr/lib OPTIONAL)
|
|
|
|
|
|
+ install(TARGETS ${target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
|
|
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
|
|
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
|
|
serenity_generated_sources(${target_name})
|
|
serenity_generated_sources(${target_name})
|
|
endfunction()
|
|
endfunction()
|
|
@@ -50,7 +50,7 @@ function(serenity_lib_static target_name fs_name)
|
|
add_library(${target_name} STATIC ${SOURCES} ${GENERATED_SOURCES})
|
|
add_library(${target_name} STATIC ${SOURCES} ${GENERATED_SOURCES})
|
|
set_target_properties(${target_name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
|
|
set_target_properties(${target_name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
|
|
set_target_properties(${target_name} PROPERTIES VERSION "serenity")
|
|
set_target_properties(${target_name} PROPERTIES VERSION "serenity")
|
|
- install(TARGETS ${target_name} DESTINATION usr/lib OPTIONAL)
|
|
|
|
|
|
+ install(TARGETS ${target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
|
|
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
|
|
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
|
|
serenity_generated_sources(${target_name})
|
|
serenity_generated_sources(${target_name})
|
|
endfunction()
|
|
endfunction()
|
|
@@ -60,7 +60,7 @@ function(serenity_libc target_name fs_name)
|
|
serenity_install_sources()
|
|
serenity_install_sources()
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib -fpic")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib -fpic")
|
|
add_library(${target_name} SHARED ${SOURCES})
|
|
add_library(${target_name} SHARED ${SOURCES})
|
|
- install(TARGETS ${target_name} DESTINATION usr/lib)
|
|
|
|
|
|
+ install(TARGETS ${target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
|
|
set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${fs_name})
|
|
# Avoid creating a dependency cycle between system libraries and the C++ standard library. This is necessary
|
|
# Avoid creating a dependency cycle between system libraries and the C++ standard library. This is necessary
|
|
# to ensure that initialization functions will be called in the right order (libc++ must come after LibPthread).
|
|
# to ensure that initialization functions will be called in the right order (libc++ must come after LibPthread).
|