From b6a91c261426c1089431f743e435bd09ad81ff9c Mon Sep 17 00:00:00 2001 From: Sylvain Thery Date: Tue, 14 Apr 2015 16:42:02 +0200 Subject: [PATCH] update apps_cmake for mac --- Apps/Examples/volumeExplorer.cpp | 2 ++ apps_cmake.txt | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Apps/Examples/volumeExplorer.cpp b/Apps/Examples/volumeExplorer.cpp index f46843726..62434a434 100644 --- a/Apps/Examples/volumeExplorer.cpp +++ b/Apps/Examples/volumeExplorer.cpp @@ -218,6 +218,7 @@ void MyQT::cb_initGL() registerShader(m_explode_render->shaderLines()); 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->setSize(m_WidthObj/2.0f); @@ -254,6 +255,7 @@ void MyQT::cb_redraw() if (clip_volume && !hide_clipping) { m_frame->draw(); + m_PlanePick->setLineWidth(2.0f); m_PlanePick->draw(); } diff --git a/apps_cmake.txt b/apps_cmake.txt index 976603732..c68b7ddba 100644 --- a/apps_cmake.txt +++ b/apps_cmake.txt @@ -21,7 +21,7 @@ # qt_wrap_cpp( pipo_moc pipo.h ) # add_executable( pipo pipo.cpp ${pipo_ui} ${pipo_moc} ) # 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/.... # Take care while choosing executable names @@ -75,7 +75,11 @@ IF (WIN32) ENDIF() ELSE() 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() # Qt version from CGoGN -- GitLab