From 786b291d9c6b784c7ce6ceef0e38a4ec76ea14db Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 6 Apr 2022 16:32:52 +0200
Subject: Move CMake files to modernized cmake syntax, step 1. Change projects
 to cmake targetsto get rid of havig to hardcore include directories and link
 libraries in consumer projects.

---
 indra/llimagej2coj/CMakeLists.txt | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'indra/llimagej2coj')

diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index c9423d50dd..6880b09025 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -7,12 +7,6 @@ include(LLCommon)
 include(LLImage)
 include(OpenJPEG)
 
-include_directories(
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLIMAGE_INCLUDE_DIRS}
-    ${OPENJPEG_INCLUDE_DIR}
-    )
-
 set(llimagej2coj_SOURCE_FILES
     llimagej2coj.cpp
     )
@@ -30,8 +24,9 @@ list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
 
 add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
 
-target_link_libraries(
-    llimagej2coj
-    ${OPENJPEG_LIBRARIES}
+target_link_libraries( llimagej2coj
+        llcommon
+        llimage
+        openjpeg::openjpeg
     )
 
-- 
cgit v1.2.3


From 241919e7f7986c11586a49bff53cf19c2c0e0ea6 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 13 Apr 2022 19:21:55 +0200
Subject: Rework cmake, the original plan was to maybe be able to use conan
 targets with the same name (that's why 3ps had names like apr::apr), but it's
 safer and saner to put the LL 3ps under the ll:: prefix. This also allows
 means it is possible to get rid of that bad "if( TRAGET ...) return()
 endif()" pattern and rather use include_guard().

---
 indra/llimagej2coj/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llimagej2coj')

diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index 6880b09025..ff7d75b709 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -27,6 +27,6 @@ add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
 target_link_libraries( llimagej2coj
         llcommon
         llimage
-        openjpeg::openjpeg
+        ll::openjpeg
     )
 
-- 
cgit v1.2.3


From 283c2a20cc4ef856076d287303c7143332b201fe Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 1 May 2022 00:38:40 +0200
Subject: Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
 sets the property on those.

---
 indra/llimagej2coj/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/llimagej2coj')

diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index ff7d75b709..93e85668dd 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -17,9 +17,6 @@ set(llimagej2coj_HEADER_FILES
     llimagej2coj.h
     )
 
-set_source_files_properties(${llimagej2coj_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
 list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
 
 add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
-- 
cgit v1.2.3