Commit c28b65af authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas
Browse files

fix packaging and install target (tested on fedora)

parent fd6c7bd9
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 18:30:43 2009 (+0200)
## Version: $Id$
## Last-Updated: mar. oct. 15 09:18:48 2013 (+0200)
## Last-Updated: jeu. nov. 28 22:52:33 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 398
## Update #: 402
######################################################################
##
### Commentary:
......@@ -33,6 +33,8 @@ mark_as_advanced(${PROJECT_NAME}_VERSION_BUILD)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include("GNUInstallDirs")
option(BUILD_SHARED_LIBS "Build shared libraries" true)
option(DTK_BUILD_TOOLS "Build tools" true)
option(DTK_BUILD_EXAMPLES "Build examples" false)
......
The d-toolkit is a meta-platform for modular scientific application development at INRIA.
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Apr 2 09:05:55 2010 (+0200)
## Version: $Id$
## Last-Updated: mer. sept. 25 14:15:28 2013 (+0200)
## By: Thibaud Kloczko
## Update #: 214
## Last-Updated: mer. déc. 4 15:15:44 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 231
######################################################################
##
### Commentary:
......@@ -69,9 +69,9 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
include_directories(${PROJECT_SOURCE_DIR}/src)
include_directories(${PROJECT_BINARY_DIR})
set(${PROJECT_NAME}_ARCHIVE_OUTPUT_DIRECTORY lib)
set(${PROJECT_NAME}_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
set(${PROJECT_NAME}_RUNTIME_OUTPUT_DIRECTORY bin)
set(${PROJECT_NAME}_LIBRARY_OUTPUT_DIRECTORY lib)
set(${PROJECT_NAME}_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${${PROJECT_NAME}_LIBRARY_OUTPUT_DIRECTORY})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${${PROJECT_NAME}_ARCHIVE_OUTPUT_DIRECTORY})
......@@ -92,8 +92,8 @@ set(${PROJECT_NAME}_USE_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Use.cmake)
set(${PROJECT_NAME}_INSTALL_INCLUDE_DIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} ${CMAKE_INSTALL_PREFIX}/include ${CMAKE_INSTALL_PREFIX}/include/dtk)
set(${PROJECT_NAME}_INSTALL_LIBRARY_DIR ${LIBRARY_INSTALL_OUTPUT_PATH})
set(${PROJECT_NAME}_INSTALL_RUNTIME_DIR ${RUNTIME_INSTALL_OUTPUT_PATH})
set(${PROJECT_NAME}_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/cmake)
set(${PROJECT_NAME}_INSTALL_USE_FILE ${CMAKE_INSTALL_PREFIX}/cmake/${PROJECT_NAME}Use.cmake)
set(${PROJECT_NAME}_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
set(${PROJECT_NAME}_INSTALL_USE_FILE ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/${PROJECT_NAME}Use.cmake)
## #################################################################
## Setup configration files
......@@ -184,17 +184,21 @@ install(FILES
${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Build.cmake
${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Pack.cmake
${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Reporting.cmake
${PROJECT_SOURCE_DIR}/cmake/FindQwt.cmake
${PROJECT_SOURCE_DIR}/cmake/FindFFmpeg.cmake
${PROJECT_BINARY_DIR}/install/${PROJECT_NAME}Config.cmake
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Use.cmake
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Uninstall.cmake
DESTINATION
cmake)
${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
endif()
install(FILES ${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Config.h DESTINATION include/${PROJECT_NAME})
if(EXISTS ${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Plugin.cmake)
install(FILES
${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Plugin.cmake
DESTINATION
cmake)
${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
endif()
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 22:51:02 2009 (+0200)
## Version: $Id$
## Last-Updated: mar. oct. 15 11:06:05 2013 (+0200)
## Last-Updated: mer. déc. 4 15:03:39 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 66
## Update #: 70
######################################################################
##
### Commentary:
......@@ -35,9 +35,10 @@ set(DTK_HAVE_PLOT "@DTK_HAVE_PLOT@")
set(DTK_HAVE_VRPN "@DTK_HAVE_VRPN@")
set(DTK_HAVE_NITE "@DTK_HAVE_NITE@")
set(DTK_HAVE_PYTHON "@DTK_HAVE_PYTHON@")
set(DTK_BUILD_WRAPPERS "@DTK_BUILD_WRAPPERS@")
set(DTK_HAVE_TCL "@DTK_HAVE_TCL@")
set(DTK_BUILD_DISTRIBUTED "@DTK_BUILD_DISTRIBUTED@")
set(DTK_BUILD_PLOT "@DTK_BUILD_PLOT@")
set(DTK_BUILD_VIDEO "@DTK_BUILD_VIDEO@")
set(DTK_BUILD_VR "@DTK_BUILD_VR@")
set(DTK_BUILD_WRAPPERS "@DTK_BUILD_WRAPPERS@")
......
### dtkConfig.cmake.in ---
##
### dtkConfig.install.cmake.in ---
##
## Author: Julien Wintz
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 22:51:02 2009 (+0200)
## Version: $Id$
## Last-Updated: Fri Apr 27 21:48:43 2012 (+0200)
## By: Julien Wintz
## Update #: 27
######################################################################
##
### Commentary:
##
##
### Commentary:
##
######################################################################
##
##
### Change log:
##
##
######################################################################
set(dtk_VERSION_MAJOR "@dtk_VERSION_MAJOR@")
......@@ -27,3 +23,10 @@ set(dtk_LIBRARY_DIRS "@dtk_INSTALL_LIBRARY_DIR@")
set(dtk_CMAKE_DIRS "@dtk_INSTALL_CMAKE_DIR@")
set(dtk_USE_FILE "@dtk_INSTALL_USE_FILE@")
set(DTK_BUILD_DISTRIBUTED "@DTK_BUILD_DISTRIBUTED@")
set(DTK_BUILD_PLOT "@DTK_BUILD_PLOT@")
set(DTK_BUILD_VIDEO "@DTK_BUILD_VIDEO@")
set(DTK_BUILD_VR "@DTK_BUILD_VR@")
set(DTK_BUILD_WRAPPERS "@DTK_BUILD_WRAPPERS@")
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Fri Apr 2 09:04:36 2010 (+0200)
## Version: $Id$
## Last-Updated: Thu Dec 6 12:57:36 2012 (+0100)
## By: Julien Wintz
## Update #: 55
## Last-Updated: mer. déc. 4 11:48:55 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 135
######################################################################
##
### Commentary:
......@@ -18,13 +18,14 @@
######################################################################
include (InstallRequiredSystemLibraries)
## #################################################################
## Global settings
## #################################################################
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
#set(CPACK_COMPONENTS_ALL apps devel libs)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
execute_process(COMMAND lsb_release -irs
COMMAND sed "s/ //"
......@@ -36,22 +37,26 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
OUTPUT_VARIABLE ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}-${DISTRIB}-${ARCH}")
set(CPACK_PACKAGING_INSTALL_PREFIX "usr" CACHE PATH "Where you want to install your package")
mark_as_advanced(CPACK_PACKAGING_INSTALL_PREFIX)
else("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}.${CMAKE_SYSTEM_PROCESSOR}")
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}-src")
set(CPACK_PACKAGE_VENDOR "http://www.inria.fr/sophia/dream")
set(CPACK_PACKAGE_VENDOR "INRIA")
set(CPACK_PACKAGE_CONTACT "Julien Wintz <julien.wintz@inria.fr>")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.txt)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME})
set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_NAME})
set(CPACK_PACKAGE_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${${PROJECT_NAME}_VERSION_BUILD})
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt)
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
#set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt)
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
## #################################################################
## Generator list
......@@ -74,28 +79,39 @@ if(WIN32)
set(CPACK_GENERATOR "NSIS")
endif(WIN32)
if(UNIX AND NOT APPLE)
set(CPACK_GENERATOR "DEB;RPM")
endif(UNIX AND NOT APPLE)
## #################################################################
## NSIS generator settings
## #################################################################
# ;
## #############################################################################
## Add postinst and prerm script
## #############################################################################
## #################################################################
## RPM generator settings
## #################################################################
if(UNIX AND NOT APPLE)
if(${DISTRIB} MATCHES fc|fedora|Fedora|Centos|centos|SUSE|Suse|suse)
## #################################################################
## RPM generator settings
## #################################################################
set(CPACK_GENERATOR "RPM")
set(CPACK_RPM_PACKAGE_REQUIRES "qt")
set(CPACK_RPM_PACKAGE_LICENSE "BSD")
set(CPACK_RPM_PACKAGE_GROUP "System Environment/Libraries")
set(CPACK_INSTALL_STUFF ${CMAKE_BINARY_DIR})
# set(CPACK_RPM_COMPONENT_INSTALL ON)
# set(CPACK_COMPONENTS_ALL apps devel libs)
else()
## #################################################################
## DEB generator settings
## #################################################################
set(CPACK_GENERATOR "DEB")
endif()
endif(UNIX AND NOT APPLE)
# ;
## #################################################################
## DEB generator settings
## NSIS generator settings
## #################################################################
# ;
## #################################################################
include(CPack)
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Tue Apr 6 10:55:48 2010 (+0200)
## Version: $Id$
## Last-Updated: Wed Sep 18 14:13:54 2013 (+0200)
## By: Julien Wintz
## Update #: 19
## Last-Updated: mer. déc. 4 15:14:18 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 22
######################################################################
##
### Commentary:
......@@ -26,7 +26,7 @@ if(NOT DTK_USE_FILE_INCLUDED)
link_directories(${dtk_LIBRARY_DIRS})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${dtk_CMAKE_DIRS})
include(dtkDependencies)
include(dtkBuild)
include(dtkReporting)
......
......@@ -4,9 +4,9 @@
## Copyright (C) 2008-2011 - Julien Wintz, Inria.
## Created: Thu Sep 8 16:00:59 2011 (+0200)
## Version: $Id$
## Last-Updated: Thu Jul 5 15:48:35 2012 (+0200)
## By: Julien Wintz
## Update #: 27
## Last-Updated: mer. déc. 4 14:02:49 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 144
######################################################################
##
### Commentary:
......@@ -25,5 +25,18 @@ file(GLOB dtk_HEADERS_LAYERS "dtk*")
list(REMOVE_AT dtk_HEADERS_LAYERS 0)
install(FILES ${dtk_HEADERS_LAYERS} DESTINATION include/dtk)
install(CODE "execute_process(COMMAND \${CMAKE_BINARY_DIR}/bin/dtkHeadersMover \${CMAKE_INSTALL_PREFIX})")
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/headers)
foreach (headerFile ${dtk_HEADERS_LAYERS})
FILE(READ ${headerFile} FILE_CONTENT)
get_filename_component(Header ${headerFile} NAME)
STRING(REGEX REPLACE "../src" ".."
MODIFIED_FILE_CONTENT "${FILE_CONTENT}")
FILE(WRITE ${CMAKE_BINARY_DIR}/headers/${Header} "${MODIFIED_FILE_CONTENT}")
endforeach (headerFile)
file(GLOB dtk_HEADERS_LAYERS_MODIFIED "${CMAKE_BINARY_DIR}/headers/dtk*")
install(FILES ${dtk_HEADERS_LAYERS_MODIFIED} DESTINATION include/dtk)
......@@ -41,4 +41,3 @@
#include "../src/dtkCore/dtkTest.h"
#include "../src/dtkCore/dtkUpdater.h"
#include "../src/dtkCore/dtkUpdater_p.h"
#include "../src/dtkCore/dtkVariant.h"
......@@ -49,6 +49,7 @@ set(${PROJECT_NAME}_HEADERS
dtkComposerGraphView.h
dtkComposerMachine.h
dtkComposerMachineState.h
dtkComposerMetatype.h
dtkComposerNode.h
dtkComposerNodeArrayData.h
dtkComposerNodeArrayDataExtractor.h
......@@ -70,6 +71,7 @@ set(${PROJECT_NAME}_HEADERS
dtkComposerNodeControlWhile.h
dtkComposerNodeData.h
dtkComposerNodeFile.h
dtkComposerNodeFile_p.h
dtkComposerNodeInteger.h
dtkComposerNodeLeaf.h
dtkComposerNodeLeafActor.h
......@@ -122,6 +124,7 @@ set(${PROJECT_NAME}_HEADERS
dtkComposerSceneNodeControl.h
dtkComposerSceneNodeHandle.h
dtkComposerSceneNodeEditor.h
dtkComposerSceneNodeEditor_p.h
dtkComposerSceneNodeLeaf.h
dtkComposerSceneNote.h
dtkComposerScenePort.h
......@@ -141,6 +144,8 @@ set(${PROJECT_NAME}_HEADERS
dtkComposerTransmitterReceiver.h
dtkComposerTransmitterReceiver.tpp
dtkComposerTransmitterVariant.h
dtkComposerTransmitterVariant_p.h
dtkComposerTransmitterVariant.tpp
dtkComposerView.h
dtkComposerReader.h
dtkComposerWriter.h)
......@@ -507,5 +512,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -15,8 +15,6 @@
#ifndef DTKCOMPOSERTRANSMITTERVARIANT_H
#define DTKCOMPOSERTRANSMITTERVARIANT_H
#include <dtkConfig.h>
#include "dtkComposerExport.h"
#include "dtkComposerTransmitter.h"
......
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 18:39:20 2009 (+0200)
## Version: $Id$
## Last-Updated: Mon Sep 30 17:04:58 2013 (+0200)
## By: Julien Wintz
## Update #: 323
## Last-Updated: mer. déc. 4 13:40:08 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 327
######################################################################
##
### Commentary:
......@@ -29,6 +29,7 @@ set(${PROJECT_NAME}_HEADERS
dtkAbstractContainerOrdered.h
dtkAbstractContainerOrdered.tpp
dtkAbstractContainerWrapper.h
dtkAbstractContainerWrapper.tpp
dtkContainerVector.h
dtkContainerVector.tpp
dtkContainerVectorWrapper.h
......@@ -123,5 +124,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME}
install(FILES ${${PROJECT_NAME}_MODULES} DESTINATION modules)
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -4,9 +4,9 @@
## Copyright (C) 2008 - Julien Wintz, Inria.
## Created: Mon Jul 20 18:39:20 2009 (+0200)
## Version: $Id$
## Last-Updated: Thu Aug 29 15:02:12 2013 (+0200)
## By: Julien Wintz
## Update #: 363
## Last-Updated: mar. déc. 3 09:41:22 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 380
######################################################################
##
### Commentary:
......@@ -28,12 +28,17 @@ set(${PROJECT_NAME}_HEADERS
dtkAbstractData_p.h
dtkAbstractDataFactory.h
dtkAbstractDataReader.h
dtkAbstractDataReader_p.h
dtkAbstractDataDeserializer.h
dtkAbstractDataDeserializer_p.h
dtkAbstractDataSerializer.h
dtkAbstractDataSerializer_p.h
dtkAbstractDataWriter.h
dtkAbstractDataWriter_p.h
dtkAbstractDataComposite.h
dtkAbstractDataComposite.tpp
dtkAbstractDataConverter.h
dtkAbstractDataConverter_p.h
dtkAbstractFactory.h
dtkAbstractObject.h
dtkAbstractObject_p.h
......@@ -44,9 +49,12 @@ set(${PROJECT_NAME}_HEADERS
dtkAbstractView.h
dtkAbstractView_p.h
dtkAbstractViewAnimator.h
dtkAbstractViewAnimator_p.h
dtkAbstractViewFactory.h
dtkAbstractViewInteractor.h
dtkAbstractViewInteractor_p.h
dtkAbstractViewNavigator.h
dtkAbstractViewNavigator_p.h
dtkArray.h
dtkArray.tpp
dtkCpuid.h
......@@ -55,6 +63,7 @@ set(${PROJECT_NAME}_HEADERS
dtkPlugin_p.h
dtkPluginManager.h
dtkUpdater.h
dtkUpdater_p.h
dtkSignalBlocker.h
dtkSingleton.h
dtkSingletonDeclare.h
......@@ -278,5 +287,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME}
install(FILES ${${PROJECT_NAME}_MODULES} DESTINATION modules)
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -111,6 +111,6 @@ install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME}
install(FILES ${${PROJECT_NAME}_MODULES} DESTINATION modules)
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -244,5 +244,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -229,5 +229,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -104,5 +104,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -4,9 +4,9 @@
## Copyright (C) 2008-2011 - Julien Wintz, Inria.
## Created: Thu Mar 1 14:34:49 2012 (+0100)
## Version: $Id$
## Last-Updated: mar. nov. 6 14:35:47 2012 (+0100)
## Last-Updated: mar. déc. 3 09:48:12 2013 (+0100)
## By: Nicolas Niclausse
## Update #: 35
## Update #: 37
######################################################################
##
### Commentary:
......@@ -26,10 +26,12 @@ project(dtkLog)
set(${PROJECT_NAME}_HEADERS
dtkLog.h
dtkLogger.h
dtkLogger_p.h
dtkLogEngine.h
dtkLogDestination.h
dtkLogModel.h
dtkLogView.h)
dtkLogView.h
dtkLogView_p.h)
set(${PROJECT_NAME}_HEADERS_MOC
dtkLogModel.h
......@@ -121,5 +123,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -123,5 +123,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
......@@ -121,5 +121,5 @@ install(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})
install(FILES ${${PROJECT_NAME}_HEADERS_QTS} DESTINATION include/${PROJECT_NAME})
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment