CMake|Gloom: Tweaking the build for Windows

skyjake · Sep 1, 2019 · 1e24c73 · 1e24c73
1 parent 6153e79
commit 1e24c73
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/doomsday/cmake/Config.cmake b/doomsday/cmake/Config.cmake
@@ -61,6 +61,7 @@ if (DEFINED CMAKE_INSTALL_LIBDIR)
 else ()
     set (DENG_INSTALL_LIB_DIR "lib")
 endif ()
+set (DENG_INSTALL_CMAKE_DIR "${DENG_INSTALL_LIB_DIR}/cmake")
 set (DENG_INSTALL_PLUGIN_DIR "${DENG_INSTALL_LIB_DIR}/doomsday")
 
 set (DENG_BUILD_STAGING_DIR "${CMAKE_BINARY_DIR}/bundle-staging")

diff --git a/doomsday/cmake/Macros.cmake b/doomsday/cmake/Macros.cmake
@@ -346,6 +346,7 @@ function (deng_add_package packName)
         OUTPUT_VARIABLE msg
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+    message (STATUS "buildpackage: ${DENG_SOURCE_DIR}/build/scripts/buildpackage.py ${fullPath} ${outDir}")
     clean_paths (msg ${msg})
     message (STATUS "${msg}")
     # Find all the source files for the package.
@@ -458,9 +459,9 @@ macro (deng_deploy_library target name)
             LIBRARY DESTINATION ${DENG_INSTALL_LIB_DIR} COMPONENT libs
             ARCHIVE DESTINATION lib COMPONENT sdk
         )
-        install (EXPORT ${name} DESTINATION ${DENG_INSTALL_LIB_DIR}/cmake/${name} NAMESPACE Deng:: COMPONENT sdk)
+        install (EXPORT ${name} DESTINATION ${DENG_INSTALL_CMAKE_DIR}/${name} NAMESPACE Deng:: COMPONENT sdk)
         install (FILES ${DENG_CMAKE_DIR}/config/${name}Config.cmake
-            DESTINATION ${DENG_INSTALL_LIB_DIR}/cmake/${name} COMPONENT sdk)
+            DESTINATION ${DENG_INSTALL_CMAKE_DIR}/${name} COMPONENT sdk)
         if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/de)
             install (DIRECTORY include/de DESTINATION include COMPONENT sdk)
         endif ()

diff --git a/doomsday/libs/gui/CMakeLists.txt b/doomsday/libs/gui/CMakeLists.txt
@@ -15,6 +15,7 @@ if (DENG_ASSIMP_EMBEDDED)
     set (ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE BOOL "Assimp: Build tools" FORCE)
     set (ASSIMP_BUILD_TESTS OFF CACHE BOOL "Assimp: Build tests" FORCE)
     set (BUILD_SHARED_LIBS OFF CACHE BOOL "Assimp: Shared library" FORCE)
+    set (ASSIMP_INSTALL_PDB OFF CACHE BOOL "Assimp: Install PDB file (MSVC)" FORCE)
     if (APPLE OR WIN32)
         set (ASSIMP_LIB_INSTALL_DIR ${DENG_INSTALL_LIB_DIR}
             CACHE PATH "libassimp install directory" FORCE

diff --git a/doomsday/tests/test_gloom/CMakeLists.txt b/doomsday/tests/test_gloom/CMakeLists.txt
@@ -5,7 +5,12 @@ set (DENG_OPENGL_API 3.3)
 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)
 set (DENG_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
-set (DENG_INSTALL_DATA_DIR share/doomsday)
+set (DENG_INSTALL_LIB_DIR lib)
+if (WIN32)
+    set (DENG_INSTALL_DATA_DIR data)
+else ()
+    set (DENG_INSTALL_DATA_DIR share/doomsday)
+endif ()
 
 # Note: Additionally CMAKE_INSTALL_PREFIX must point to the SDK install dir.
 # This is used for finding the .pack files.