Skip to content
This repository has been archived by the owner on Mar 22, 2023. It is now read-only.

Commit

Permalink
Merge pull request #98 from marcinslusarz/relwithdebinfo
Browse files Browse the repository at this point in the history
Add support for RelWithDebInfo build type.
  • Loading branch information
marcinslusarz committed Apr 19, 2017
2 parents bcba061 + 05ed2b3 commit b264aa4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,12 @@ add_c_flag(-DDEBUG DEBUG)
add_cxx_flag(-ggdb DEBUG)
add_cxx_flag(-DDEBUG DEBUG)

add_c_flag(-ggdb RELWITHDEBINFO)
add_cxx_flag(-ggdb RELWITHDEBINFO)

add_c_flag(-fno-omit-frame-pointer RELWITHDEBINFO)
add_cxx_flag(-fno-omit-frame-pointer RELWITHDEBINFO)

add_c_flag("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" RELEASE C_CAN_FORTIFY)
add_cxx_flag("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" RELEASE CXX_CAN_FORTIFY)

Expand Down
6 changes: 3 additions & 3 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ generate_man2txt(mkfs.pmemfile.1)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/generated/libpmemfile-posix.3
DESTINATION ${CMAKE_INSTALL_MANDIR}/man3
CONFIGURATIONS Release None)
CONFIGURATIONS Release None RelWithDebInfo)
if(BUILD_LIBPMEMFILE)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/generated/libpmemfile.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
CONFIGURATIONS Release None)
CONFIGURATIONS Release None RelWithDebInfo)
endif()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/generated/mkfs.pmemfile.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
CONFIGURATIONS Release None)
CONFIGURATIONS Release None RelWithDebInfo)
6 changes: 3 additions & 3 deletions src/libpmemfile-posix/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ add_custom_target(pmemfile-posix_static ALL DEPENDS libpmemfile-posix.a)
configure_file(libpmemfile-posix.pc.in libpmemfile-posix.pc)

install(TARGETS pmemfile-posix_shared
CONFIGURATIONS Release None
CONFIGURATIONS Release None RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

Expand All @@ -113,15 +113,15 @@ install(TARGETS pmemfile-posix_shared
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpmemfile-posix.a
CONFIGURATIONS Release None
CONFIGURATIONS Release None RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_LIBDIR})

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpmemfile-posix.a
CONFIGURATIONS Debug
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pmemfile_debug)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpmemfile-posix.pc
CONFIGURATIONS Release None
CONFIGURATIONS Release None RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

add_cstyle(pmemfile-posix)
Expand Down
2 changes: 1 addition & 1 deletion src/libpmemfile/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ add_custom_command(OUTPUT libpmemfile.a
add_custom_target(pmemfile_static ALL DEPENDS libpmemfile.a)

install(TARGETS pmemfile_shared LIBRARY
CONFIGURATIONS Release None
CONFIGURATIONS Release None RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_LIBDIR})

install(TARGETS pmemfile_shared LIBRARY
Expand Down
2 changes: 1 addition & 1 deletion src/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ add_executable(pmemfile-cat pmemfile-cat.c)
target_link_libraries(pmemfile-cat pmemfile-posix_shared)

install(TARGETS mkfs.pmemfile
CONFIGURATIONS Release None
CONFIGURATIONS Release None RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

Expand Down

0 comments on commit b264aa4

Please sign in to comment.