Skip to content

Commit

Permalink
Revert "Automatically append '64' to the library dir if we're buildin…
Browse files Browse the repository at this point in the history
…g 64 bit libraries on linux". Closes #101

This reverts commit a1bd5e9.
  • Loading branch information
arr2036 committed Jul 13, 2021
1 parent b46d101 commit c54b309
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Linux)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "default install path" FORCE )
endif()

#
# Set library directory correctly if we're building 64bit libraries
#
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
if ("${LIB64}" STREQUAL "TRUE")
set(LIB_SUFFIX 64)
else()
set(LIB_SUFFIX "")
endif()
list(APPEND LIBKQUEUE_SOURCES
src/posix/platform.c
src/posix/platform.h
Expand Down Expand Up @@ -245,8 +235,7 @@ configure_file("${CMAKE_SOURCE_DIR}/libkqueue.pc.in"
#
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ${CMAKE_INSTALL_FULL_MANDIR}
${CMAKE_INSTALL_FULL_MANDIR}/man2
${CMAKE_INSTALL_FULL_INCLUDEDIR}/sys
${CMAKE_INSTALL_FULL_LIBDIR}${LIB_SUFFIX}/pkgconfig)
${CMAKE_INSTALL_FULL_INCLUDEDIR}/sys)

install(FILES
"${CMAKE_SOURCE_DIR}/include/sys/event.h"
Expand All @@ -257,7 +246,7 @@ install(FILES
install(TARGETS
kqueue
DESTINATION
"${CMAKE_INSTALL_FULL_LIBDIR}${LIB_SUFFIX}"
"${CMAKE_INSTALL_FULL_LIBDIR}"
COMPONENT libraries)
install(FILES
"${CMAKE_SOURCE_DIR}/kqueue.2"
Expand All @@ -267,7 +256,7 @@ install(FILES
install(FILES
"${CMAKE_BINARY_DIR}/libkqueue.pc"
DESTINATION
"${CMAKE_INSTALL_FULL_LIBDIR}${LIB_SUFFIX}/pkgconfig"
"${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig"
COMPONENT pkgconfig)

set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
Expand Down

0 comments on commit c54b309

Please sign in to comment.