diff options
| author |  Elvio Basello | 2008-05-04 23:40:13 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-05-04 23:40:13 +0000 |
| commit | 257b874e3ad11d2effbfaef3afdd89d3f4b944c1 (patch) | |
| tree | d23673d942196a4f1e4585ea7dfc36b515e3678b | |
| parent | code cleanup (diff) | |
| download | KVIrc-257b874e3ad11d2effbfaef3afdd89d3f4b944c1.tar.gz KVIrc-257b874e3ad11d2effbfaef3afdd89d3f4b944c1.tar.bz2 KVIrc-257b874e3ad11d2effbfaef3afdd89d3f4b944c1.zip | |
applied patch for lib path. thanks to Arfrever Frehtes Taifersar Arahesis
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1676 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | doc/INSTALL | 4 | ||||
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/INSTALL b/doc/INSTALL index c9c438c12..13f292a77 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -88,6 +88,10 @@ General notes for the installation of the 4.0 release of KVIrc -DINSTALL_PREFIX=/path It will install all stuff under /path directory + -DLIB_INSTALL_PREFIX=/path + It will install libkvilib under /path directory. It defaults to + ${INSTALL_PREFIX}/lib. + -DCOMPILE_MACOSX_UNIVERSAL_BINARY Compile universal binary for MacOS X platform diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index b3634d30e..980548d81 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -203,7 +203,11 @@ IF(UNIX) INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Frameworks) ELSE() # Assume linux - INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/lib) + IF(NOT DEFINED LIB_INSTALL_PREFIX) + INSTALL(TARGETS kvilib LIBRARY DESTINATION ${INSTALL_PREFIX}/lib) + ELSE() + INSTALL(TARGETS kvilib LIBRARY DESTINATION ${LIB_INSTALL_PREFIX}) + ENDIF() ENDIF() ELSEIF(WIN32) # INSTALL(TARGETS kvilib LIBRARY DESTINATION ???) |