51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 8ed6db358dc3195fe374169a0c3a9c6397e6474e Mon Sep 17 00:00:00 2001
|
|
From: Christian Weigel <christian.weigel@idmt.fraunhofer.de>
|
|
Date: Fri, 17 Feb 2017 10:07:48 +0100
|
|
Subject: [PATCH] fix static build of ilu and ilut
|
|
|
|
---
|
|
DevIL/src-ILU/CMakeLists.txt | 10 +++++++---
|
|
DevIL/src-ILUT/CMakeLists.txt | 10 +++++++---
|
|
2 files changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
|
|
index 44b9531b..1ade7cb4 100644
|
|
--- a/DevIL/src-ILU/CMakeLists.txt
|
|
+++ b/DevIL/src-ILU/CMakeLists.txt
|
|
@@ -42,8 +42,13 @@ source_group("Source Files" FILES src/*.cpp)
|
|
source_group("Header Files" FILES ${ILU_INC} )
|
|
source_group("Resource Files" FILES ${ILU_RSRC} )
|
|
|
|
-# Remove SHARED to create a static library
|
|
-add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
|
|
+if(BUILD_SHARED_LIBS)
|
|
+ add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
|
|
+ set_target_properties(ILU PROPERTIES SOVERSION 1)
|
|
+else(BUILD_SHARED_LIBS)
|
|
+ add_library(ILU ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC})
|
|
+endif(BUILD_SHARED_LIBS)
|
|
+
|
|
|
|
|
|
## ILU requires IL
|
|
diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
|
|
index 63662bc6..4953708c 100644
|
|
--- a/DevIL/src-ILUT/CMakeLists.txt
|
|
+++ b/DevIL/src-ILUT/CMakeLists.txt
|
|
@@ -62,8 +62,13 @@ source_group("Source Files" FILES src/*.cpp)
|
|
source_group("Header Files" FILES ${ILUT_INC} )
|
|
source_group("Resource Files" FILES ${ILUT_RSRC} )
|
|
|
|
-# Remove SHARED to create a static library
|
|
-add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
|
|
+if(BUILD_SHARED_LIBS)
|
|
+ add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
|
|
+ set_target_properties(ILUT PROPERTIES SOVERSION 1)
|
|
+else(BUILD_SHARED_LIBS)
|
|
+ add_library(ILUT ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC})
|
|
+endif(BUILD_SHARED_LIBS)
|
|
+
|
|
|
|
## add link sub library info
|
|
target_link_libraries(ILUT
|