diff options
| author | Denton Woods <denton.woods@gmail.com> | 2017-01-01 01:25:18 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2017-01-01 01:25:18 -0600 |
| commit | f9d385e4cabe77764149f229c7fa68f6831121ad (patch) | |
| tree | 2450b6db10c9f292a8cfe4a17313b17efd549a21 | |
| parent | 1a72a81d44c91a7014cbb5be9729a528a38176b7 (diff) | |
| download | devil-f9d385e4cabe77764149f229c7fa68f6831121ad.tar.gz | |
- Cleanup of CMakeLists and fix for libSquish under Linux
| -rw-r--r-- | DevIL/cmake/Modules/FindlibSquish.cmake | 2 | ||||
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | DevIL/src-ILU/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | DevIL/src-ILUT/CMakeLists.txt | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/DevIL/cmake/Modules/FindlibSquish.cmake b/DevIL/cmake/Modules/FindlibSquish.cmake index a8d7cfed..fd45d830 100644 --- a/DevIL/cmake/Modules/FindlibSquish.cmake +++ b/DevIL/cmake/Modules/FindlibSquish.cmake @@ -11,4 +11,6 @@ SET(LIBSQUISH_LIBRARIES ${LIBSQUISH_LIBRARY}) IF (LIBSQUISH_LIBRARY AND LIBSQUISH_INCLUDE_DIR) SET(LIBSQUISH_FOUND TRUE) MESSAGE(STATUS "Found libSquish: ${LIBSQUISH_LIBRARY}") +ELSE (LIBSQUISH_LIBRARY AND LIBSQUISH_INCLUDE_DIR) + MESSAGE(STATUS "Could not find libSquish") ENDIF (LIBSQUISH_LIBRARY AND LIBSQUISH_INCLUDE_DIR) diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 1d521c38..5231f47f 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -151,8 +151,6 @@ set(LIBDIR "../lib/") set(LIBDIR "${LIBDIR}${EX_PLATFORM_NAME}") if(UNICODE) set(LIBDIR "${LIBDIR}/unicode") -else(UNICODE) - set(LIBDIR "${LIBDIR}") # Seems not to terminate properly if not Unicode endif(UNICODE) set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBDIR}) set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}) diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt index 00d0f1aa..17a3afe7 100644 --- a/DevIL/src-ILU/CMakeLists.txt +++ b/DevIL/src-ILU/CMakeLists.txt @@ -62,8 +62,6 @@ set(LIBDIR "../lib/") set(LIBDIR "${LIBDIR}${EX_PLATFORM_NAME}") if(UNICODE) set(LIBDIR "${LIBDIR}/unicode") -else(UNICODE) - set(LIBDIR "${LIBDIR}") # Seems not to terminate properly if not Unicode endif(UNICODE) set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBDIR}) set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}) diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt index 9fea82e6..21470cbc 100644 --- a/DevIL/src-ILUT/CMakeLists.txt +++ b/DevIL/src-ILUT/CMakeLists.txt @@ -60,8 +60,6 @@ set(LIBDIR "../lib/") set(LIBDIR "${LIBDIR}${EX_PLATFORM_NAME}") if(UNICODE) set(LIBDIR "${LIBDIR}/unicode") -else(UNICODE) - set(LIBDIR "${LIBDIR}") # Seems not to terminate properly if not Unicode endif(UNICODE) set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBDIR}) set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBDIR}) |