diff options
| author | Ben Campbell <ben@scumways.com> | 2016-08-06 16:55:06 +1200 |
|---|---|---|
| committer | Ben Campbell <ben@scumways.com> | 2016-08-06 16:55:06 +1200 |
| commit | 128527b9e92af40bbf3c0c504edfb9df993cd1d9 (patch) | |
| tree | c14496159c964253df732b4b941a307534686d00 | |
| parent | e627865eb739e6a90bb3f01b055a78a7a18536e6 (diff) | |
| download | devil-128527b9e92af40bbf3c0c504edfb9df993cd1d9.tar.gz | |
restore lib name (libIL.so instead of libDevIL.so)
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | DevIL/src-ILU/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | DevIL/src-ILUT/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 334121d6..6d140577 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -39,9 +39,9 @@ SOURCE_GROUP("Resource Files" FILES ${DevIL_RSRC} ) SOURCE_GROUP("Text Files" FILES ${DevIL_TXT} ) IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(DevIL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) + ADD_LIBRARY(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) ELSE(BUILD_SHARED_LIBS) - ADD_LIBRARY(DevIL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) + ADD_LIBRARY(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) ENDIF(BUILD_SHARED_LIBS) @@ -98,12 +98,12 @@ endif(IL_USE_DXTC_NVIDIA) include_directories(${incs}) -target_link_libraries(DevIL ${libs}) +target_link_libraries(IL ${libs}) # Installation -install (TARGETS DevIL +install (TARGETS IL ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt index 8e3ea8bd..7ed0295e 100644 --- a/DevIL/src-ILU/CMakeLists.txt +++ b/DevIL/src-ILU/CMakeLists.txt @@ -40,8 +40,7 @@ ADD_LIBRARY(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC}) ## add link sub library info TARGET_LINK_LIBRARIES(ILU - - DevIL + IL ) INCLUDE_DIRECTORIES( diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index 9f77700e..9977eb15 100644 --- a/DevIL/src-ILUT/CMakeLists.txt +++ b/DevIL/src-ILUT/CMakeLists.txt @@ -41,13 +41,11 @@ ADD_LIBRARY(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC}) ## add link sub library info TARGET_LINK_LIBRARIES(ILUT - - DevIL + IL ILU ) INCLUDE_DIRECTORIES( - ${DevIL_SOURCE_DIR}/../include ${DevIL_SOURCE_DIR}/include ${DevILU_SOURCE_DIR}/include |