MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit f3603ccf authored by Julien Wintz's avatar Julien Wintz
Browse files

Updating usage of generated export header files.

parent bcd33a11
......@@ -50,10 +50,6 @@ add_library(${PROJECT_NAME} SHARED
${${PROJECT_NAME}_SOURCES}
${${PROJECT_NAME}_HEADERS})
set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_RPATH 0)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
## ###################################################################
## Link rules
## ###################################################################
......@@ -62,6 +58,14 @@ qt5_use_modules(${PROJECT_NAME} Core)
target_link_libraries(${PROJECT_NAME} dtkMeta)
## #################################################################
## Target properties
## #################################################################
set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_RPATH 0)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
## #################################################################
## Export header file
## #################################################################
......
......@@ -16,7 +16,7 @@
#include <QtCore>
#include <dtkCoreExport>
#include "dtkCoreExport.h"
// /////////////////////////////////////////////////////////////////
//
......
......@@ -14,7 +14,7 @@
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
class dtkDistributedCommunicatorPlugin;
class dtkDistributedCommunicatorPluginFactory;
......
......@@ -15,7 +15,7 @@
#pragma once
#include "dtkDistributedMessage.h"
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
#include <QtNetwork>
......
......@@ -14,7 +14,7 @@
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QTcpSocket>
......
/* @(#)dtkDistributedPolicy.h ---
*
* Author: Nicolas Niclausse
* Copyright (C) 2013 - Nicolas Niclausse, Inria.
* Created: 2013/02/18 15:10:52
*/
// Version: $Id$
//
//
/* Commentary:
*
*/
// Commentary:
//
//
/* Change log:
*
*/
// Change Log:
//
//
// Code:
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
......@@ -52,3 +51,6 @@ public:
public:
dtkDistributedPolicyPrivate *d;
};
//
// dtkDistributedPolicy.h ends here
......@@ -15,7 +15,7 @@
#pragma once
#include "dtkDistributedResourceManager.h"
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
#include <QtNetwork>
......
......@@ -14,7 +14,7 @@
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
......
......@@ -15,7 +15,7 @@
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
#include <QtNetwork>
......
......@@ -14,7 +14,7 @@
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
......
/* @(#)dtkDistributedWorker.h ---
*
* Author: Nicolas Niclausse
* Copyright (C) 2013 - Nicolas Niclausse, Inria.
* Created: 2013/02/15 13:53:00
*/
// Version: $Id$
//
//
/* Commentary:
*
*/
// Commentary:
//
//
/* Change log:
*
*/
// Change Log:
//
//
// Code:
#pragma once
#include <QtCore>
#include "dtkDistributed.h"
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
class dtkDistributedCommunicator;
class dtkDistributedContainer;
......@@ -70,3 +69,6 @@ public:
private:
dtkDistributedWorkerPrivate *d;
};
//
// dtkDistributedWorker.h ends here
/* @(#)dtkDistributedWorkerManager.h ---
*
* Author: Nicolas Niclausse
* Copyright (C) 2013 - Nicolas Niclausse, Inria.
* Created: 2013/02/14 13:17:10
*/
// Version: $Id$
//
//
/* Commentary:
*
*/
// Commentary:
//
//
/* Change log:
*
*/
// Change Log:
//
//
// Code:
#pragma once
#include <dtkDistributedExport>
#include "dtkDistributedExport.h"
#include <QtCore>
......@@ -49,3 +48,6 @@ public:
dtkDistributedWorkerManagerPrivate *d;
};
//
// dtkDistributedWorkerManager.h ends here
......@@ -16,7 +16,7 @@
#pragma once
#include "dtkLog"
#include <dtkLogExport>
#include "dtkLogExport.h"
#include <QtCore>
#include <QtDebug>
......
......@@ -17,7 +17,7 @@
#include <QtCore>
#include <QtDebug>
#include <dtkLogExport>
#include "dtkLogExport.h"
class QFileSystemWatcher;
......
......@@ -15,7 +15,7 @@
#pragma once
#include <dtkMathExport>
#include "dtkMathExport.h"
#include <QtCore/qglobal.h>
#include <QtCore/qatomic.h>
......
......@@ -48,11 +48,9 @@ qt5_use_modules(${PROJECT_NAME} Core)
## Target properties
## ###################################################################
if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_RPATH 1)
set_target_properties(${PROJECT_NAME} PROPERTIES
INSTALL_NAME_DIR "@executable_path/../lib")
endif(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_RPATH 0)
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
## #################################################################
## Export header file
......
......@@ -16,7 +16,7 @@
#include "dtkMeta.h"
#include "dtkMetaContainerSequential_p.h"
#include <dtkMetaExport>
#include "dtkMetaExport.h"
// /////////////////////////////////////////////////////////////////
// dtkMetaContainerSequential definition
......
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