[#2] Fix interdependencies and CMake warnings

Godlike · Dec 11, 2018 · 34b07ec · 34b07ec
1 parent 060a67e
commit 34b07ec
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,6 +65,18 @@ if (Mule_FOUND)
     include(${Mule_CONFIG_DIR}/MuleUtilitiesConfig.cmake)
 endif()
 
+# Tulpar
+message("====================================")
+message("== Preparing Tulpar audio library ==")
+message("====================================")
+
+set(TULPAR_BUILD_DOCUMENTATION ${SLEIPNIR_BUILD_DOCUMENTATION} CACHE BOOL "Build Tulpar documentation")
+set(TULPAR_BUILD_DEMOS OFF CACHE BOOL "Build Tulpar demos")
+set(TULPAR_BUILD_TESTS OFF CACHE BOOL "Build Tulpar tests")
+set(TULPAR_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/godlike/Tulpar" CACHE STRING "Tulpar root directory.")
+
+add_subdirectory(${TULPAR_ROOT})
+
 # Unicorn Render
 message("========================================")
 message("== Preparing Unicorn rendering engine ==")
@@ -120,18 +132,6 @@ set(PEGASUS_BUILD_DEBUG OFF CACHE BOOL "Build Pegasus debug.")
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/godlike/Pegasus)
 
-# Tulpar
-message("====================================")
-message("== Preparing Tulpar audio library ==")
-message("====================================")
-
-set(TULPAR_BUILD_DOCUMENTATION ${SLEIPNIR_BUILD_DOCUMENTATION} CACHE BOOL "Build Tulpar documentation")
-set(TULPAR_BUILD_DEMOS OFF CACHE BOOL "Build Tulpar demos")
-set(TULPAR_BUILD_TESTS OFF CACHE BOOL "Build Tulpar tests")
-set(TULPAR_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/godlike/Tulpar" CACHE STRING "Tulpar root directory.")
-
-add_subdirectory(${TULPAR_ROOT})
-
 # Install information
 message("=====================================")
 message("== Preparing packaging information ==")

diff --git a/SleipnirEngine/CMakeLists.txt b/SleipnirEngine/CMakeLists.txt
@@ -9,7 +9,7 @@ project(SleipnirEngine)
 
 set(SLEIPNIR_LIB_ALIAS Sleipnir::Engine)
 
-add_library(${PROJECT_NAME})
+add_library(${PROJECT_NAME} "")
 add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 add_library(${SLEIPNIR_LIB_ALIAS} ALIAS ${PROJECT_NAME})
 
@@ -68,6 +68,8 @@ target_include_directories(${PROJECT_NAME}
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:${SLEIPNIR_INSTALL_INCLUDE_DIR}>
+        $<TARGET_PROPERTY:Sleipnir::Engine::ECS,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:Sleipnir::Engine::Utility,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 # external depencies
@@ -84,7 +86,7 @@ if (UNIX)
 endif()
 
 target_link_libraries(${PROJECT_NAME}
-    PUBLIC
+    PRIVATE
         ${EXPORT_SYMBOLS_PREFIX}
         Sleipnir::Engine::ECS
         Sleipnir::Engine::Utility

diff --git a/SleipnirEngine/ecs/CMakeLists.txt b/SleipnirEngine/ecs/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_policy(VERSION 3.8)
 
 project(SleipnirEngine_ECS)
 
-add_library(${PROJECT_NAME} STATIC)
+add_library(${PROJECT_NAME} STATIC "")
 add_library(Sleipnir::Engine::ECS ALIAS ${PROJECT_NAME})
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)

diff --git a/SleipnirEngine/utility/CMakeLists.txt b/SleipnirEngine/utility/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_policy(VERSION 3.8)
 
 project(SleipnirEngine_Utility)
 
-add_library(${PROJECT_NAME} STATIC)
+add_library(${PROJECT_NAME} STATIC "")
 add_library(Sleipnir::Engine::Utility ALIAS ${PROJECT_NAME})
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)

diff --git a/godlike/Arion b/godlike/Arion
diff --git a/godlike/Epona b/godlike/Epona
diff --git a/godlike/Mule b/godlike/Mule
diff --git a/godlike/Pegasus b/godlike/Pegasus
diff --git a/godlike/Tulpar b/godlike/Tulpar
diff --git a/godlike/Unicorn b/godlike/Unicorn
+1 −1		Epona/CMakeLists.txt
+1 −1		Epona/EponaMathConfig.cmake.in
+3 −3		TulparAudio/CMakeLists.txt
+1 −1		TulparAudio/audio/CMakeLists.txt
+7 −4		TulparAudio/internal/CMakeLists.txt
+2 −0		CMakeLists.txt
+10 −13		UnicornRender/CMakeLists.txt
+1 −1		UnicornRender/system/CMakeLists.txt
+1 −1		UnicornRender/utility/CMakeLists.txt
+5 −2		UnicornRender/video/CMakeLists.txt
+0 −7		cmake/UnicornRenderConfig.cmake
+1 −4		demos/SanicJymper/CMakeLists.txt
+2 −2		demos/SanicJymper/main.cpp