Commit 4fe46548 authored by Martin Schultz's avatar Martin Schultz

* added cmake recursive folders in msvc for OpenFlipper and OpenFlipper

* PluginLib
parent 7e20f9d7
...@@ -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})
......
...@@ -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
......
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