- Updated CMake files with a cleaner way to assign output folders

3 files changed, 33 insertions, 69 deletions

diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 0941ea1d..4db0a89b 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -145,33 +145,17 @@ else(SQUISH_FOUND)
     set(IL_USE_DXTC_SQUISH 0)
 endif(SQUISH_FOUND)
 
-if(EX_PLATFORM EQUAL 64)
-	if(UNICODE)
-		set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x64/unicode")
-		set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x64/unicode")
-		set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x64/unicode")
-	else(UNICODE)
-		set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x64")
-		set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x64")
-		set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x64")
-	endif(UNICODE)
-else(EX_PLATFORM EQUAL 64)
-	if(UNICODE)
-		set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x86/unicode")
-		set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x86/unicode")
-		set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x86/unicode")
-	else(UNICODE)
-		set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x86")
-		set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x86")
-		set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x86")
-	endif(UNICODE)
-endif(EX_PLATFORM EQUAL 64)
-
-set(OUTFOLDER "../lib")
-if(EX_PLATFORM EQUAL 64)
-	set(OUTFOLDER ${OUTFOLDER})
-else(EX_PLATFORM EQUAL 64)
-endif(EX_PLATFORM EQUAL 64)
+# Sets the output folders
+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})
+set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR})
 
 if(WIN32)
 	# Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses
diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
index bb7479c4..00d0f1aa 100644
--- a/DevIL/src-ILU/CMakeLists.txt
+++ b/DevIL/src-ILU/CMakeLists.txt
@@ -57,27 +57,17 @@ target_link_libraries(ILU
 configure_file( pkgconfig/ILU.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc @ONLY)
 
-if(EX_PLATFORM EQUAL 64)
-	if(UNICODE)
-		set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x64/unicode")
-		set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x64/unicode")
-		set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x64/unicode")
-	else(UNICODE)
-		set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x64")
-		set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x64")
-		set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x64")
-	endif(UNICODE)
-else(EX_PLATFORM EQUAL 64)
-	if(UNICODE)
-		set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x86/unicode")
-		set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x86/unicode")
-		set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x86/unicode")
-	else(UNICODE)
-		set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x86")
-		set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x86")
-		set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x86")
-	endif(UNICODE)
-endif(EX_PLATFORM EQUAL 64)
+# Sets the output folders
+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})
+set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR})
 
 if(UNICODE)
 	MESSAGE("Compiling ILU Unicode")
diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
index 1b20d90e..9fea82e6 100644
--- a/DevIL/src-ILUT/CMakeLists.txt
+++ b/DevIL/src-ILUT/CMakeLists.txt
@@ -55,27 +55,17 @@ target_link_libraries(ILUT
 configure_file( pkgconfig/ILUT.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc @ONLY)
 
-if(EX_PLATFORM EQUAL 64)
-	if(UNICODE)
-		set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x64/unicode")
-		set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x64/unicode")
-		set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x64/unicode")
-	else(UNICODE)
-		set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x64")
-		set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x64")
-		set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x64")
-	endif(UNICODE)
-else(EX_PLATFORM EQUAL 64)
-	if(UNICODE)
-		set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x86/unicode")
-		set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x86/unicode")
-		set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x86/unicode")
-	else(UNICODE)
-		set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/x86")
-		set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/x86")
-		set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/x86")
-	endif(UNICODE)
-endif(EX_PLATFORM EQUAL 64)
+# Sets the output folders
+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})
+set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR})
 
 if(UNICODE)
 	MESSAGE("Compiling ILUT Unicode")