songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix link error of demo/Polyhedron, in Debug and CGAL_HEADER_ONLY

This commit is contained in:
Laurent Rineau 2017-07-27 17:07:17 +02:00
parent 0c4ee274e9
commit 8dfa4f4dc8
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CGAL_Core/include/CGAL/export/CORE.h
View File

@ -47,7 +47,8 @@
// If CGAL_EXPORTS is defined, one are building the CGAL library, and we do // If CGAL_EXPORTS is defined, one are building the CGAL library, and we do
// not want artificial dll-imports of Core symbols (because of // not want artificial dll-imports of Core symbols (because of
// auto-linking). // auto-linking).
#if ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIBS) #if ( ! defined(CGAL_EXPORTS) ) && defined(CGAL_BUILD_SHARED_LIBS) \
&& ( ! defined(CGAL_HEADER_ONLY) )
# if defined(CGAL_Core_EXPORTS) // defined by CMake or in cpp files of the dll # if defined(CGAL_Core_EXPORTS) // defined by CMake or in cpp files of the dll

2
CGAL_ImageIO/include/CGAL/export/ImageIO.h
View File

@ -23,7 +23,7 @@
#include <CGAL/config.h> #include <CGAL/config.h>
#include <CGAL/export/helpers.h> #include <CGAL/export/helpers.h>
#if defined(CGAL_BUILD_SHARED_LIBS) #if defined(CGAL_BUILD_SHARED_LIBS) && ! defined(CGAL_HEADER_ONLY)
# if defined(CGAL_ImageIO_EXPORTS) // defined by CMake or in cpp files of the dll # if defined(CGAL_ImageIO_EXPORTS) // defined by CMake or in cpp files of the dll

3
GraphicsView/include/CGAL/export/Qt.h
View File

@ -26,7 +26,8 @@
#include <CGAL/config.h> #include <CGAL/config.h>
#include <CGAL/export/helpers.h> #include <CGAL/export/helpers.h>
#if defined(CGAL_BUILD_SHARED_LIBS) || defined(CGAL_USE_Qt5_RESOURCES) #if ( defined(CGAL_BUILD_SHARED_LIBS) && ( ! defined(CGAL_HEADER_ONLY) ) ) \
|| defined(CGAL_USE_Qt5_RESOURCES)
# if defined(CGAL_Qt5_EXPORTS) || defined(CGAL_USE_Qt5_RESOURCES) # if defined(CGAL_Qt5_EXPORTS) || defined(CGAL_USE_Qt5_RESOURCES)
// defined by CMake or in cpp files of the dll // defined by CMake or in cpp files of the dll

2
Installation/include/CGAL/export/CGAL.h
View File

@ -23,7 +23,7 @@
#include <CGAL/config.h> #include <CGAL/config.h>
#include <CGAL/export/helpers.h> #include <CGAL/export/helpers.h>
#if defined(CGAL_BUILD_SHARED_LIBS) #if defined(CGAL_BUILD_SHARED_LIBS) && ! defined(CGAL_HEADER_ONLY)
# if defined(CGAL_EXPORTS) // defined by CMake or in cpp files of the dll # if defined(CGAL_EXPORTS) // defined by CMake or in cpp files of the dll