Commit b6a91c26 authored by Sylvain Thery's avatar Sylvain Thery

update apps_cmake for mac

parent 6209557e
...@@ -218,6 +218,7 @@ void MyQT::cb_initGL() ...@@ -218,6 +218,7 @@ void MyQT::cb_initGL()
registerShader(m_explode_render->shaderLines()); registerShader(m_explode_render->shaderLines());
m_PlanePick = new Utils::Pickable(Utils::Pickable::GRID,1); m_PlanePick = new Utils::Pickable(Utils::Pickable::GRID,1);
m_PlanePick->drawable()->setColor(Geom::Vec4f(1.0f,1.0f,0.0f,0.0f));
m_frame = new Utils::FrameManipulator(); m_frame = new Utils::FrameManipulator();
m_frame->setSize(m_WidthObj/2.0f); m_frame->setSize(m_WidthObj/2.0f);
...@@ -254,6 +255,7 @@ void MyQT::cb_redraw() ...@@ -254,6 +255,7 @@ void MyQT::cb_redraw()
if (clip_volume && !hide_clipping) if (clip_volume && !hide_clipping)
{ {
m_frame->draw(); m_frame->draw();
m_PlanePick->setLineWidth(2.0f);
m_PlanePick->draw(); m_PlanePick->draw();
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# qt_wrap_cpp( pipo_moc pipo.h ) # qt_wrap_cpp( pipo_moc pipo.h )
# add_executable( pipo pipo.cpp ${pipo_ui} ${pipo_moc} ) # add_executable( pipo pipo.cpp ${pipo_ui} ${pipo_moc} )
# target_link_libraries( pipo ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) # target_link_libraries( pipo ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
# # qt_use_cgogn_modules(pipo)
# #
# WARNING: to avoid problem of DLL loading, on windows executable are generated in CGoGN/bin/.... # WARNING: to avoid problem of DLL loading, on windows executable are generated in CGoGN/bin/....
# Take care while choosing executable names # Take care while choosing executable names
...@@ -75,7 +75,11 @@ IF (WIN32) ...@@ -75,7 +75,11 @@ IF (WIN32)
ENDIF() ENDIF()
ELSE() ELSE()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} ) link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE} ) IF(APPLE)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}/Contents/MacOS/ )
ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE} )
ENDIF()
ENDIF() ENDIF()
# Qt version from CGoGN # Qt version from CGoGN
......
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