added cm_windows.manifest and updated submodules.

2021-09-09 18:06:38 +08:00
parent beac800ba8
commit 200102705c
7 changed files with 10 additions and 8 deletions
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,10 @@ if(CM_BUILD_TOOLS)
    ENDIF()

 if(WIN32)
-    include_directories("TexConv/DevIL Windows SDK/include")
-    link_directories("TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
+    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/include")
+    link_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
+
+    set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
 endif(WIN32)

    set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2