Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Backports:SLE-15:Update
stp
0001-CMake-fix-dirs-again.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-CMake-fix-dirs-again.patch of Package stp
From f1dcd662a97ca0fe70bb48c780c1412053d8d7cf Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> Date: Tue, 10 Oct 2017 13:50:40 +0200 Subject: [PATCH] CMake: fix dirs again ffa7994 already did this, but was reverted by mistake in 4fd9b5b. Signed-off-by: Jiri Slaby <jslaby@suse.cz> --- CMakeLists.txt | 8 ++++---- lib/CMakeLists.txt | 6 +++--- tools/stp/CMakeLists.txt | 2 +- tools/stp_simple/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7ebcc972f..4757f70702 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,9 @@ endif() # Search paths for custom CMake modules set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) -set(LIBDIR lib CACHE STRING "Output directory for libraries") -set(BINDIR bin CACHE STRING "Output directory for executables") -set(INCLUDEDIR include CACHE STRING "Output directory for include headers") +set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Output directory for libraries") +set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Output directory for executables") +set(CMAKE_INSTALL_INCLUDEDIR include CACHE STRING "Output directory for include headers") set(STP_TIMESTAMPS ON CACHE BOOL "Enable build with timestamps") # ----------------------------------------------------------------------------- @@ -542,7 +542,7 @@ export(PACKAGE STP) if(WIN32 AND NOT CYGWIN) set(DEF_INSTALL_CMAKE_DIR CMake) else() - set(DEF_INSTALL_CMAKE_DIR ${LIBDIR}/cmake/STP) + set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/STP) endif() set(STP_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for STP CMake files" diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4353ba14ee..badeba6fb5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -136,7 +136,7 @@ target_link_libraries(libstp install(TARGETS libstp EXPORT ${STP_EXPORT_NAME} - LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBDIR}" - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR}/stp" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/stp" ) diff --git a/tools/stp/CMakeLists.txt b/tools/stp/CMakeLists.txt index ec6219e046..58d47d06e9 100644 --- a/tools/stp/CMakeLists.txt +++ b/tools/stp/CMakeLists.txt @@ -43,6 +43,6 @@ if (Boost_FOUND) target_link_libraries(stp libstp) install(TARGETS stp EXPORT ${STP_EXPORT_NAME} - RUNTIME DESTINATION "${BINDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) endif() diff --git a/tools/stp_simple/CMakeLists.txt b/tools/stp_simple/CMakeLists.txt index 33c3ff54ad..a9b1a6d10e 100644 --- a/tools/stp_simple/CMakeLists.txt +++ b/tools/stp_simple/CMakeLists.txt @@ -38,5 +38,5 @@ target_link_libraries(stp_simple libstp) install(TARGETS stp_simple EXPORT ${STP_EXPORT_NAME} - RUNTIME DESTINATION ${BINDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -- 2.14.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor