From 8f8d51e17b24ef0e0e77f23b0bd75c7fcefd86de Mon Sep 17 00:00:00 2001
From: Philip Rideout <philiprideout@gmail.com>
Date: Wed, 9 Dec 2020 10:03:42 -0800
Subject: [PATCH] Code review fixups for libibl_lite.

---
 android/filament-android/CMakeLists.txt |  8 ++++----
 filament/CMakeLists.txt                 |  2 +-
 libs/ibl/CMakeLists.txt                 | 15 ++++++++-------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/android/filament-android/CMakeLists.txt b/android/filament-android/CMakeLists.txt
index 16d9dc0c04..9833a30eae 100644
--- a/android/filament-android/CMakeLists.txt
+++ b/android/filament-android/CMakeLists.txt
@@ -17,9 +17,9 @@ add_library(utils STATIC IMPORTED)
 set_target_properties(utils PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libutils.a)
 
-add_library(ibl_lite STATIC IMPORTED)
-set_target_properties(ibl_lite PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libibl_lite.a)
+add_library(ibl-lite STATIC IMPORTED)
+set_target_properties(ibl-lite PROPERTIES IMPORTED_LOCATION
+        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libibl-lite.a)
 
 add_library(filaflat STATIC IMPORTED)
 set_target_properties(filaflat PROPERTIES IMPORTED_LOCATION
@@ -92,7 +92,7 @@ target_link_libraries(filament-jni
     PRIVATE filaflat
     PRIVATE filabridge
     PRIVATE geometry
-    PRIVATE ibl_lite
+    PRIVATE ibl-lite
     PRIVATE log
     PRIVATE GLESv3
     PRIVATE EGL
diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt
index f952213622..de33165949 100644
--- a/filament/CMakeLists.txt
+++ b/filament/CMakeLists.txt
@@ -350,7 +350,7 @@ target_link_libraries(${TARGET} PUBLIC utils)
 target_link_libraries(${TARGET} PUBLIC geometry) # TODO: remove this dependency after deprecating VertexBuffer::populateTangentQuaternions
 target_link_libraries(${TARGET} PUBLIC filaflat)
 target_link_libraries(${TARGET} PUBLIC filabridge)
-target_link_libraries(${TARGET} PUBLIC ibl_lite)
+target_link_libraries(${TARGET} PUBLIC ibl-lite)
 
 if (FILAMENT_ENABLE_MATDBG)
     target_link_libraries(${TARGET} PUBLIC matdbg)
diff --git a/libs/ibl/CMakeLists.txt b/libs/ibl/CMakeLists.txt
index 361ef9016d..c251cb3a76 100644
--- a/libs/ibl/CMakeLists.txt
+++ b/libs/ibl/CMakeLists.txt
@@ -37,25 +37,26 @@ add_library(${TARGET} ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
 target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
 target_link_libraries(${TARGET} math utils)
 
-add_library(${TARGET}_lite ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
-target_compile_definitions(${TARGET}_lite PUBLIC -DFILAMENT_IBL_LITE=1)
-target_include_directories(${TARGET}_lite PUBLIC ${PUBLIC_HDR_DIR})
-target_link_libraries(${TARGET}_lite math utils)
+add_library(${TARGET}-lite ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS})
+target_compile_definitions(${TARGET}-lite PUBLIC -DFILAMENT_IBL_LITE=1)
+target_include_directories(${TARGET}-lite PUBLIC ${PUBLIC_HDR_DIR})
+target_link_libraries(${TARGET}-lite math utils)
 
 # ==================================================================================================
 # Compile options and optimizations
 # ==================================================================================================
 if (MSVC)
     target_compile_options(${TARGET} PRIVATE /fp:fast)
-    target_compile_options(${TARGET}_lite PRIVATE /fp:fast)
+    target_compile_options(${TARGET}-lite PRIVATE /fp:fast)
 else()
     target_compile_options(${TARGET} PRIVATE -ffast-math)
-    target_compile_options(${TARGET}_lite PRIVATE -ffast-math)
+    target_compile_options(${TARGET}-lite PRIVATE -ffast-math)
 endif()
 
 
 # ==================================================================================================
 # Installation
 # ==================================================================================================
-install(TARGETS ${TARGET}_lite ARCHIVE DESTINATION lib/${DIST_DIR})
+install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR})
+install(TARGETS ${TARGET}-lite ARCHIVE DESTINATION lib/${DIST_DIR})
 install(DIRECTORY ${PUBLIC_HDR_DIR}/ibl DESTINATION include)