Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
e442ce7f
Commit
e442ce7f
authored
Mar 04, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve pb of path loading for plugins
parent
abad6c04
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
9 deletions
+40
-9
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+1
-1
SCHNApps/Plugins/CMakeLists.txt
SCHNApps/Plugins/CMakeLists.txt
+15
-0
SCHNApps/Plugins/plugins_cmake.txt
SCHNApps/Plugins/plugins_cmake.txt
+0
-6
SCHNApps/Plugins/schnapps/CMakeLists.txt
SCHNApps/Plugins/schnapps/CMakeLists.txt
+15
-2
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+9
-0
No files found.
SCHNApps/CMakeLists.txt
View file @
e442ce7f
...
...
@@ -28,7 +28,7 @@ IF(WIN32)
ENDIF
()
ELSE
()
SET
(
EXECUTABLE_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
#
SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
...
...
SCHNApps/Plugins/CMakeLists.txt
View file @
e442ce7f
cmake_minimum_required
(
VERSION 2.8
)
Project
(
Plugins
)
IF
(
WIN32
)
IF
(
CGoGN_WITH_QTCREATOR
)
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib/plugins/
${
CMAKE_BUILD_TYPE
}
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib/plugins
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/bin/
${
ConfigurationName
}
)
ENDIF
()
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib/plugins/
${
CMAKE_BUILD_TYPE
}
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
ADD_SUBDIRECTORY
(
surface_import
)
ADD_SUBDIRECTORY
(
surface_render
)
ADD_SUBDIRECTORY
(
surface_renderVector
)
...
...
SCHNApps/Plugins/plugins_cmake.txt
View file @
e442ce7f
...
...
@@ -7,12 +7,6 @@ if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
endif()
IF(WIN32 AND (NOT(CGoGN_WITH_QTCREATOR)))
SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/)
ELSE()
SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
ENDIF()
ADD_LIBRARY( ${PLUGIN_NAME} SHARED
${PLUGIN_FILES}
${PLUGIN_UIC_FILES}
...
...
SCHNApps/Plugins/schnapps/CMakeLists.txt
View file @
e442ce7f
...
...
@@ -4,10 +4,23 @@ project(SCHNAppsLib)
IF
(
WIN32
AND
(
NOT
(
CGoGN_WITH_QTCREATOR
)))
file
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/plugins_default_directory.h
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${
CGoGN_ROOT_DIR}/bin/\" ) # NOT POSSIBLE TO KNOW IF WE ARE IN DEBUG OR RELEASE
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${
SCHNApps_ROOT_DIR}/lib/plugins/\" )
ELSE
()
file
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/plugins_default_directory.h
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/plugins/${CMAKE_BUILD_TYPE}\" )
ENDIF
()
IF
(
WIN32
)
IF
(
CGoGN_WITH_QTCREATOR
)
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/bin/
${
ConfigurationName
}
)
ENDIF
()
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
# SCHNApps files to compile in a lib for dll access from plugins
...
...
SCHNApps/src/schnapps.cpp
View file @
e442ce7f
...
...
@@ -364,7 +364,16 @@ void SCHNApps::splitView(const QString& name, Qt::Orientation orientation)
void
SCHNApps
::
registerPluginsDirectory
(
const
QString
&
path
)
{
#ifdef WIN32
#ifdef _DEBUG
QDir
directory
(
path
+
QString
(
"Debug/"
);
#else
QDir
directory
(
path
+
QString
(
"Release/"
));
#endif
#else
QDir
directory
(
path
);
#endif
if
(
directory
.
exists
())
{
QStringList
filters
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment