Rearrange extern so includes don't need to start with extern/

apps/opencs/view/render/scenewidget.cpp

@@ -14,8 +14,8 @@
 #include <apps/opencs/view/render/lightingday.hpp>
 #include <apps/opencs/view/render/lightingnight.hpp>
 
-#include <extern/osgQt/CompositeOsgRenderer.hpp>
+#include <osgQt/CompositeOsgRenderer.hpp>
-#include <extern/osgQt/osgQOpenGLWidget.hpp>
+#include <osgQt/osgQOpenGLWidget.hpp>
 
 #include <osg/Array>
 #include <osg/Camera>

apps/openmw/CMakeLists.txt

@@ -170,8 +170,8 @@ target_link_libraries(openmw-lib
     ${MyGUI_LIBRARIES}
     SDL2::SDL2
     ${RecastNavigation_LIBRARIES}
-    "osg-ffmpeg-videoplayer"
+    osg-ffmpeg-videoplayer
-    "oics"
+    oics
     components
 )
 

apps/openmw/mwgui/videowidget.cpp

@@ -1,6 +1,6 @@
 #include "videowidget.hpp"
 
-#include <extern/osg-ffmpeg-videoplayer/videoplayer.hpp>
+#include <osg-ffmpeg-videoplayer/videoplayer.hpp>
 
 #include <MyGUI_RenderManager.h>
 

apps/openmw/mwinput/bindingsmanager.cpp

@@ -4,8 +4,8 @@
 
 #include <MyGUI_EditBox.h>
 
-#include <extern/oics/ICSChannelListener.h>
+#include <oics/ICSChannelListener.h>
-#include <extern/oics/ICSInputControlSystem.h>
+#include <oics/ICSInputControlSystem.h>
 
 #include <components/debug/debuglog.hpp>
 #include <components/files/conversion.hpp>

apps/openmw/mwsound/ffmpegdecoder.cpp

@@ -8,8 +8,8 @@
 #include <components/debug/debuglog.hpp>
 #include <components/vfs/manager.hpp>
 
-#include <extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp>
+#include <osg-ffmpeg-videoplayer/libavformatdefines.hpp>
-#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+#include <osg-ffmpeg-videoplayer/libavutildefines.hpp>
 
 #if OPENMW_FFMPEG_5_OR_GREATER
 #include <libavutil/channel_layout.h>

apps/openmw/mwsound/ffmpegdecoder.hpp

@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
-#include <extern/osg-ffmpeg-videoplayer/libavformatdefines.hpp>
+#include <osg-ffmpeg-videoplayer/libavformatdefines.hpp>
-#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+#include <osg-ffmpeg-videoplayer/libavutildefines.hpp>
 
 #if defined(_MSC_VER)
 #pragma warning(push)

apps/openmw/mwsound/movieaudiofactory.cpp

@@ -1,8 +1,8 @@
 #include "movieaudiofactory.hpp"
 
-#include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
+#include <osg-ffmpeg-videoplayer/audiodecoder.hpp>
-#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+#include <osg-ffmpeg-videoplayer/libavutildefines.hpp>
-#include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
+#include <osg-ffmpeg-videoplayer/videostate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"

apps/openmw/mwsound/movieaudiofactory.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H
 #define OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H
 
-#include <extern/osg-ffmpeg-videoplayer/audiofactory.hpp>
+#include <osg-ffmpeg-videoplayer/audiofactory.hpp>
 
 namespace MWSound
 {

components/files/hash.cpp

@@ -1,6 +1,6 @@
 #include "hash.hpp"
 
-#include <extern/smhasher/MurmurHash3.h>
+#include <smhasher/MurmurHash3.h>
 
 #include <array>
 #include <cstdint>

extern/oics/CMakeLists.txt

@@ -5,18 +5,27 @@ add_library(oics STATIC
     ICSInputControlSystem_keyboard.cpp
     ICSInputControlSystem_mouse.cpp
     ICSInputControlSystem_joystick.cpp
-    ICSPrerequisites.h
+    include/oics/ICSChannel.h
+    include/oics/ICSChannelListener.h
+    include/oics/ICSControl.h
+    include/oics/ICSControlListener.h
+    include/oics/ICSInputControlSystem.h
+    include/oics/ICSPrerequisites.h
 )
 
+target_include_directories(oics PUBLIC include)
+target_include_directories(oics PRIVATE include/oics)
+
 if(USE_SYSTEM_TINYXML)
     target_link_libraries(oics ${TinyXML_LIBRARIES})
 else()
     add_library(local_tinyxml STATIC
-        tinyxml.cpp
+        tinyxml/tinyxml.cpp
-        tinyxmlparser.cpp
+        tinyxml/tinyxmlparser.cpp
-        tinyxmlerror.cpp
+        tinyxml/tinyxmlerror.cpp
-        tinystr.cpp
+        tinyxml/tinystr.cpp
     )
+    target_include_directories(local_tinyxml PUBLIC tinyxml)
     target_link_libraries(oics local_tinyxml)
 endif()
 

extern/osg-ffmpeg-videoplayer/CMakeLists.txt

@@ -5,18 +5,23 @@ set(OSG_FFMPEG_VIDEOPLAYER_LIBRARY "osg-ffmpeg-videoplayer")
 set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
     videoplayer.cpp
     videostate.cpp
-    videodefs.hpp
     audiodecoder.cpp
-    audiofactory.hpp
+    include/osg-ffmpeg-videoplayer/audiodecoder.hpp
+    include/osg-ffmpeg-videoplayer/audiofactory.hpp
+    include/osg-ffmpeg-videoplayer/libavformatdefines.hpp
+    include/osg-ffmpeg-videoplayer/libavutildefines.hpp
+    include/osg-ffmpeg-videoplayer/videodefs.hpp
+    include/osg-ffmpeg-videoplayer/videoplayer.hpp
+    include/osg-ffmpeg-videoplayer/videostate.hpp
 )
 
-include_directories(${FFmpeg_INCLUDE_DIRS})
 add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${OSG_LIBRARIES})
 target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} SDL2::SDL2)
 
-link_directories(${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PUBLIC include ${FFmpeg_INCLUDE_DIRS})
+target_include_directories(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PRIVATE include/osg-ffmpeg-videoplayer)
 
 if (MSVC AND PRECOMPILE_HEADERS_WITH_MSVC)
     target_precompile_headers(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} PUBLIC

extern/osg-ffmpeg-videoplayer/audiodecoder.cpp

@@ -1,7 +1,5 @@
 #include "audiodecoder.hpp"
 
-#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
-
 #include <algorithm>
 #include <stdexcept>
 #include <string>
@@ -24,6 +22,7 @@ extern "C"
     #include <libavutil/channel_layout.h>
 #endif
 
+#include "libavutildefines.hpp"
 #include "videostate.hpp"
 
 namespace

extern/osg-ffmpeg-videoplayer/include/osg-ffmpeg-videoplayer/audiodecoder.hpp

@@ -6,7 +6,7 @@
 #include <new>
 #include <memory>
 
-#include <extern/osg-ffmpeg-videoplayer/libavutildefines.hpp>
+#include <osg-ffmpeg-videoplayer/libavutildefines.hpp>
 
 #if defined(_MSC_VER)
     #pragma warning (push)

extern/osgQt/CMakeLists.txt

@@ -3,8 +3,8 @@ set(OSGQT_LIBRARY "osgQt")
 # Sources
 
 set(SOURCE_H
-    osgQOpenGLWidget.hpp
+    include/osgQt/osgQOpenGLWidget.hpp
-    CompositeOsgRenderer.hpp
+    include/osgQt/CompositeOsgRenderer.hpp
 )
 
 qt_wrap_cpp(SOURCES_H_MOC ${SOURCE_H} )
@@ -16,9 +16,9 @@ set(OSGQT_SOURCE_FILES
 )
 
 add_library(${OSGQT_LIBRARY} STATIC ${OSGQT_SOURCE_FILES})
+target_include_directories(${OSGQT_LIBRARY} PUBLIC include)
+target_include_directories(${OSGQT_LIBRARY} PRIVATE include/osgQt)
 
 target_link_libraries(${OSGQT_LIBRARY} Qt::Core Qt::OpenGL Qt::OpenGLWidgets)
 
-link_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 set(EXTERN_OSGQT_LIBRARY ${OSGQT_LIBRARY} PARENT_SCOPE)

extern/smhasher/CMakeLists.txt

@@ -1,2 +1,3 @@
-add_library(smhasher STATIC MurmurHash3.cpp)
+add_library(smhasher STATIC MurmurHash3.cpp include/smhasher/MurmurHash3.h)
-target_include_directories(smhasher INTERFACE .)
+target_include_directories(smhasher PUBLIC include)
+target_include_directories(smhasher PRIVATE include/smhasher)