diff options
| author | Ľubomír Carik <Lubomir.Carik@gmail.com> | 2017-02-01 22:31:12 +0100 |
|---|---|---|
| committer | Ľubomír Carik <Lubomir.Carik@gmail.com> | 2017-02-02 01:06:55 +0100 |
| commit | df5721b5f42016297391bb95feb5e906982844c0 (patch) | |
| tree | 97a6fcd98936ddbb8d7e8fa01b83bde40e55e5c3 | |
| parent | 95aaf6026fba94253a5ad711d4235598a26fa43a (diff) | |
| download | libproxy-git-df5721b5f42016297391bb95feb5e906982844c0.tar.gz | |
Install libs/cmake/pkgconfig thingy into right place for MinGW
MinGW folder structure is closer to Linux.
This allow use other MinGW package to utilize CMake or pkgconfig
to setup the project.
Signed-off-by: Ľubomír Carik <Lubomir.Carik@gmail.com>
| -rw-r--r-- | cmake/paths.cmk | 6 | ||||
| -rw-r--r-- | libproxy/cmake/devfiles.cmk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmake/paths.cmk b/cmake/paths.cmk index 6b614fe..593ebc1 100644 --- a/cmake/paths.cmk +++ b/cmake/paths.cmk @@ -1,4 +1,4 @@ -if(WIN32) +if(WIN32 AND NOT MINGW) set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install prefix") set(BIN_INSTALL_DIR . CACHE PATH "Binary install dir") set(LIB_INSTALL_DIR . CACHE PATH "Library install dir") @@ -6,7 +6,7 @@ if(WIN32) set(INCLUDE_INSTALL_DIR include CACHE PATH "Include install dir") set(SYSCONF_INSTALL_DIR . CACHE PATH "Configuration install dir") set(SHARE_INSTALL_DIR . CACHE PATH "Data install dir") -else(WIN32) +else(WIN32 AND NOT MINGW) set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Install prefix") set(BIN_INSTALL_DIR bin CACHE PATH "Binary install dir") set(LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Library install dir") @@ -14,4 +14,4 @@ else(WIN32) set(INCLUDE_INSTALL_DIR include CACHE PATH "Include install dir") set(SYSCONF_INSTALL_DIR /etc CACHE PATH "Configuration install dir") set(SHARE_INSTALL_DIR share CACHE PATH "Data install dir") -endif(WIN32) +endif(WIN32 AND NOT MINGW) diff --git a/libproxy/cmake/devfiles.cmk b/libproxy/cmake/devfiles.cmk index 97c4281..0301dce 100644 --- a/libproxy/cmake/devfiles.cmk +++ b/libproxy/cmake/devfiles.cmk @@ -1,4 +1,4 @@ -if(NOT WIN32) +if(NOT WIN32 OR MINGW) # PkgConfig file set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) @@ -20,4 +20,4 @@ if(NOT WIN32) # CMake Find helper configure_file(${CMAKE_SOURCE_DIR}/libproxy/Findlibproxy.cmake.in ${CMAKE_BINARY_DIR}/Findlibproxy.cmake @ONLY) install(FILES ${CMAKE_BINARY_DIR}/Findlibproxy.cmake DESTINATION ${SHARE_INSTALL_DIR}/cmake/Modules) -endif() +endif(NOT WIN32 OR MINGW) |