comparison Resources/CMake/OrthancStoneConfiguration.cmake @ 699:5c551f078c18 refactor-viewport-controller

Merge from default
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 17 May 2019 09:20:46 +0200
parents 8b6adfb62a2f 7719eb852dd5
children 059e1fd05fd6
comparison
equal deleted inserted replaced
698:8b6adfb62a2f 699:5c551f078c18
144 ) 144 )
145 endif() 145 endif()
146 146
147 147
148 if (ENABLE_OPENGL) 148 if (ENABLE_OPENGL)
149 include(FindOpenGL) 149 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
150 if (NOT OPENGL_FOUND) 150 # If including "FindOpenGL.cmake" using Emscripten (targeting
151 message(FATAL_ERROR "Cannot find OpenGL on your system") 151 # WebAssembly), the "OPENGL_LIBRARIES" value incorrectly includes
152 endif() 152 # the "nul" library, which leads to warning message in Emscripten:
153 153 # 'shared:WARNING: emcc: cannot find library "nul"'.
154 link_libraries(${OPENGL_LIBRARIES}) 154 include(FindOpenGL)
155 if (NOT OPENGL_FOUND)
156 message(FATAL_ERROR "Cannot find OpenGL on your system")
157 endif()
158
159 link_libraries(${OPENGL_LIBRARIES})
160 endif()
155 161
156 add_definitions( 162 add_definitions(
157 -DGL_GLEXT_PROTOTYPES=1 163 -DGL_GLEXT_PROTOTYPES=1
158 -DORTHANC_ENABLE_OPENGL=1 164 -DORTHANC_ENABLE_OPENGL=1
159 ) 165 )
415 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ShearWarpProjectiveTransform.cpp 421 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ShearWarpProjectiveTransform.cpp
416 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/Slice.cpp 422 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/Slice.cpp
417 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/SlicesSorter.cpp 423 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/SlicesSorter.cpp
418 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/UndoRedoStack.cpp 424 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/UndoRedoStack.cpp
419 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ViewportGeometry.cpp 425 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ViewportGeometry.cpp
426 ${ORTHANC_STONE_ROOT}/Framework/Toolbox/VolumeImageGeometry.cpp
420 ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoContext.cpp 427 ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoContext.cpp
421 ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoSurface.cpp 428 ${ORTHANC_STONE_ROOT}/Framework/Viewport/CairoSurface.cpp
422 ${ORTHANC_STONE_ROOT}/Framework/Viewport/IMouseTracker.h 429 ${ORTHANC_STONE_ROOT}/Framework/Viewport/IMouseTracker.h
423 ${ORTHANC_STONE_ROOT}/Framework/Viewport/IStatusBar.h 430 ${ORTHANC_STONE_ROOT}/Framework/Viewport/IStatusBar.h
424 ${ORTHANC_STONE_ROOT}/Framework/Viewport/IViewport.h 431 ${ORTHANC_STONE_ROOT}/Framework/Viewport/IViewport.h