Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
detect lib vs lib64
Browse files Browse the repository at this point in the history
Signed-off-by: Michele Dolfi <[email protected]>
dolfim-ibm committed Aug 6, 2024
1 parent d90a64c commit ca42692
Showing 3 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -33,6 +33,12 @@ if(NOT DEFINED EXTERNALS_PREFIX_PATH)
set(EXTERNALS_PREFIX_PATH "${TOPLEVEL_PREFIX_PATH}/externals" CACHE INTERNAL "")
endif()

if("${CMAKE_INSTALL_LIBDIR}" STREQUAL "lib64")
set(EXTERNALS_LIBDIR "${EXTERNALS_PREFIX_PATH}/lib64")
else()
set(EXTERNALS_LIBDIR "${EXTERNALS_PREFIX_PATH}/lib")
endif()

if(NOT DEFINED RESOURCES_PREFIX_PATH)
set(RESOURCES_PREFIX_PATH "${TOPLEVEL_PREFIX_PATH}/resources" CACHE INTERNAL "")
endif()
@@ -56,6 +62,7 @@ message(STATUS "arch flags: " ${ENV_ARCHFLAGS})

message(STATUS " top path: " ${TOPLEVEL_PREFIX_PATH})
message(STATUS " lib path: " ${EXTERNALS_PREFIX_PATH})
message(STATUS " ext lib path: " ${EXTERNALS_LIBDIR})
message(STATUS " install path: " ${CMAKE_INSTALL_PREFIX})
message(STATUS " cmake path: " ${CMAKE_MODULE_PATH})
message(STATUS " cmake system: " ${CMAKE_SYSTEM_PROCESSOR})
@@ -81,7 +88,7 @@ message(STATUS "cxx-standard: " ${CMAKE_CXX_STANDARD})

if(NOT EXISTS ${EXTERNALS_PREFIX_PATH})
execute_process(COMMAND mkdir ${EXTERNALS_PREFIX_PATH})
execute_process(COMMAND mkdir ${EXTERNALS_PREFIX_PATH}/lib)
execute_process(COMMAND mkdir ${EXTERNALS_LIBDIR}) # /lib or /lib64
execute_process(COMMAND mkdir ${EXTERNALS_PREFIX_PATH}/bin)
execute_process(COMMAND mkdir ${EXTERNALS_PREFIX_PATH}/include)
execute_process(COMMAND mkdir ${EXTERNALS_PREFIX_PATH}/resources)
2 changes: 1 addition & 1 deletion cmake/extlib_jpeg.cmake
Original file line number Diff line number Diff line change
@@ -28,5 +28,5 @@ ExternalProject_Add(extlib_jpeg
LOG_BUILD ON)

add_library(jpeg STATIC IMPORTED)
set_target_properties(jpeg PROPERTIES IMPORTED_LOCATION ${EXTERNALS_PREFIX_PATH}/lib/libjpeg.a)
set_target_properties(jpeg PROPERTIES IMPORTED_LOCATION ${EXTERNALS_LIBDIR}/libjpeg.a)
add_dependencies(jpeg extlib_jpeg)
4 changes: 2 additions & 2 deletions cmake/extlib_qpdf.cmake
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ ExternalProject_Add(extlib_qpdf
--enable-crypto-native=yes\\
--prefix=${EXTERNALS_PREFIX_PATH} \\
CPPFLAGS=-I${EXTERNALS_PREFIX_PATH}/include \\
LDFLAGS="-L${EXTERNALS_PREFIX_PATH}/lib/ -L${EXTERNALS_PREFIX_PATH}/lib64/"
LDFLAGS=-L${EXTERNALS_LIBDIR}

#CMAKE_ARGS \\
# -DCMAKE_INSTALL_PREFIX=${EXTERNALS_PREFIX_PATH}
@@ -44,5 +44,5 @@ ExternalProject_Add(extlib_qpdf
LOG_BUILD ON)

add_library(qpdf STATIC IMPORTED)
set_target_properties(qpdf PROPERTIES IMPORTED_LOCATION ${EXTERNALS_PREFIX_PATH}/lib/libqpdf.a)
set_target_properties(qpdf PROPERTIES IMPORTED_LOCATION ${EXTERNALS_LIBDIR}/libqpdf.a)
add_dependencies(qpdf extlib_qpdf)

0 comments on commit ca42692

Please sign in to comment.