Start: Allow system Microsoft GSL to be used
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
|
||||
#include <Base/PyObjectBase.h>
|
||||
|
||||
#include <3rdParty/GSL/include/gsl/pointers>
|
||||
#include <gsl/pointers>
|
||||
|
||||
namespace Start
|
||||
{
|
||||
|
||||
@@ -21,8 +21,15 @@
|
||||
# * *
|
||||
# ***************************************************************************/
|
||||
|
||||
if( NOT EXISTS "${CMAKE_SOURCE_DIR}/src/3rdParty/GSL" )
|
||||
if ( EXISTS "${CMAKE_SOURCE_DIR}/src/3rdParty/GSL/include" )
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/src/3rdParty/GSL/include )
|
||||
else()
|
||||
find_package(Microsoft.GSL)
|
||||
if( Microsoft.GSL_FOUND )
|
||||
message( STATUS "Found Microsoft.GSL: version ${Microsoft.GSL_VERSION}" )
|
||||
else()
|
||||
message( SEND_ERROR "The C++ Guidelines Support Library (GSL) submodule is not available. Please run git submodule update --init" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
add_subdirectory(App)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <Gui/MainWindow.h>
|
||||
|
||||
|
||||
#include <3rdParty/GSL/include/gsl/pointers>
|
||||
#include <gsl/pointers>
|
||||
|
||||
#include "Manipulator.h"
|
||||
#include "StartView.h"
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "../App/DisplayedFilesModel.h"
|
||||
#include "App/Application.h"
|
||||
#include <App/Color.h>
|
||||
#include <3rdParty/GSL/include/gsl/pointers>
|
||||
#include <gsl/pointers>
|
||||
|
||||
using namespace Start;
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <Gui/MainWindow.h>
|
||||
#include <Gui/MenuManager.h>
|
||||
|
||||
#include <3rdParty/GSL/include/gsl/pointers>
|
||||
#include <gsl/pointers>
|
||||
|
||||
DEF_STD_CMD(CmdStart)
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <Base/Interpreter.h>
|
||||
#include <Gui/Application.h>
|
||||
#include <Gui/Command.h>
|
||||
#include <3rdParty/GSL/include/gsl/pointers>
|
||||
#include <gsl/pointers>
|
||||
|
||||
using namespace StartGui;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user