[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/kgllib
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2008-08-30 18:08:50
Message-ID: 1220119730.126819.13126.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 854950 by rivol:

Set some paths before find_package() so that the latter can also search from where \
kgllib  will be installed.
  This fixes the case where dependencies (e.g. Eigen2) that were installed to the \
same uncommon  prefix as kgllib weren't found.

 M  +7 -6      CMakeLists.txt  


--- trunk/playground/libs/kgllib/CMakeLists.txt #854949:854950
@@ -9,6 +9,13 @@
 # Add our own cmake files
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules \
)  
+# These are set here so that find_package() calls can make use of them
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}  CACHE PATH  "Base directory for \
executables and libraries" FORCE) +set(LIB_INSTALL_DIR      \
"${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"  CACHE PATH "The subdirectory relative to \
the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" \
FORCE) +set(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"  CACHE PATH "The \
subdirectory to the header prefix" FORCE) +set(DATA_INSTALL_DIR  \
"${CMAKE_INSTALL_PREFIX}/share/apps"  CACHE PATH "The subdirectory where apps can \
install their data" FORCE) +
 # Find required packages
 set(QT_USE_OPENGL true)
 find_package(Qt4 REQUIRED)
@@ -19,12 +26,6 @@
     message(FATAL_ERROR "GLU was not found")
 endif(NOT OPENGL_GLU_FOUND)
 
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
-set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}  CACHE PATH  "Base directory for \
                executables and libraries" FORCE)
-set(LIB_INSTALL_DIR      "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"  CACHE PATH "The \
subdirectory relative to the install prefix where libraries will be installed \
                (default is /lib${LIB_SUFFIX})" FORCE)
-set(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"  CACHE PATH "The \
                subdirectory to the header prefix" FORCE)
-set(DATA_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/share/apps"  CACHE PATH "The \
                subdirectory where apps can install their data" FORCE)
-
 # Taken from FindKDE4Internal.cmake
 set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
                                   LIBRARY DESTINATION "${LIB_INSTALL_DIR}"


[prev in list] [next in list] [prev in thread] [next in thread]