Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
4fe46548
Commit
4fe46548
authored
May 19, 2016
by
Martin Schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* added cmake recursive folders in msvc for OpenFlipper and OpenFlipper
* PluginLib
parent
7e20f9d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
CoreApp/CMakeLists.txt
CoreApp/CMakeLists.txt
+2
-0
PluginLib/CMakeLists.txt
PluginLib/CMakeLists.txt
+3
-0
No files found.
CoreApp/CMakeLists.txt
View file @
4fe46548
...
@@ -119,6 +119,8 @@ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/static_plugins.cc" ";\n} /* namespace c
...
@@ -119,6 +119,8 @@ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/static_plugins.cc" ";\n} /* namespace c
list
(
APPEND RC_SRC
"
${
CMAKE_CURRENT_BINARY_DIR
}
/static_plugins.cc"
)
list
(
APPEND RC_SRC
"
${
CMAKE_CURRENT_BINARY_DIR
}
/static_plugins.cc"
)
RECURSE_GROUPS
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../
)
if
(
WIN32
)
if
(
WIN32
)
# add app icon rc file to windows build
# add app icon rc file to windows build
acg_add_executable
(
${
OPENFLIPPER_PRODUCT_STRING
}
WIN32
${
CMAKE_CURRENT_SOURCE_DIR
}
/CoreApp.rc
${
uic_targets
}
${
sources
}
${
headers
}
${
moc_targets
}
${
RC_SRC
}
)
acg_add_executable
(
${
OPENFLIPPER_PRODUCT_STRING
}
WIN32
${
CMAKE_CURRENT_SOURCE_DIR
}
/CoreApp.rc
${
uic_targets
}
${
sources
}
${
headers
}
${
moc_targets
}
${
RC_SRC
}
)
...
...
PluginLib/CMakeLists.txt
View file @
4fe46548
...
@@ -157,6 +157,7 @@ endif ()
...
@@ -157,6 +157,7 @@ endif ()
#=======================================================
#=======================================================
# Create library
# Create library
#=======================================================
#=======================================================
RECURSE_GROUPS
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../
)
if
(
QT5_FOUND
)
if
(
QT5_FOUND
)
acg_add_library
(
OpenFlipperPluginLib SHARED
${
uic_targets
}
${
sources
}
${
headers
}
${
moc_targets
}
)
acg_add_library
(
OpenFlipperPluginLib SHARED
${
uic_targets
}
${
sources
}
${
headers
}
${
moc_targets
}
)
...
@@ -164,6 +165,7 @@ elseif (QT4_FOUND)
...
@@ -164,6 +165,7 @@ elseif (QT4_FOUND)
acg_add_library
(
OpenFlipperPluginLib SHARED
${
uic_targets
}
${
sources
}
${
headers
}
${
moc_targets
}
)
acg_add_library
(
OpenFlipperPluginLib SHARED
${
uic_targets
}
${
sources
}
${
headers
}
${
moc_targets
}
)
endif
()
endif
()
if
(
ADDITIONAL_PLUGINLIB_COMPILER_FLAGS
)
if
(
ADDITIONAL_PLUGINLIB_COMPILER_FLAGS
)
set_target_properties
(
set_target_properties
(
OpenFlipperPluginLib PROPERTIES
OpenFlipperPluginLib PROPERTIES
...
@@ -171,6 +173,7 @@ if( ADDITIONAL_PLUGINLIB_COMPILER_FLAGS )
...
@@ -171,6 +173,7 @@ if( ADDITIONAL_PLUGINLIB_COMPILER_FLAGS )
)
)
endif
()
endif
()
target_link_libraries
(
OpenFlipperPluginLib
target_link_libraries
(
OpenFlipperPluginLib
${
OPENMESH_LIBRARIES
}
${
OPENMESH_LIBRARIES
}
ACG
ACG
...
...
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