From c60babb42b6b0250e5039a089b0c82ac4f539d55 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 7 Jul 2023 11:26:52 -0500
Subject: [PATCH] Clean up CMake files

---
 azure-pipelines.yml               | 6 +++---
 base/console/CMakeLists.txt       | 4 ++--
 base/est/CMakeLists.txt           | 4 ++--
 base/server-webapp/CMakeLists.txt | 4 ++--
 base/server/CMakeLists.txt        | 8 ++++----
 base/tks/CMakeLists.txt           | 4 +++-
 base/tools/CMakeLists.txt         | 2 +-
 base/tps/CMakeLists.txt           | 4 ++--
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6984d32e34d..aaa217ccff2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -47,7 +47,7 @@ jobs:
       for rpm in $RPMS
       do
           docker exec runner \
-              rpm -qlp "/root/build/pki/RPMS/$rpm" | tee -a files
+              rpm -qlp "/root/build/pki/RPMS/$rpm" | tee -a file_list
       done
 
       # exclude RPM-specific files
@@ -57,7 +57,7 @@ jobs:
           -e '/^\/usr\/share\/doc\//d' \
           -e '/^\/usr\/lib\/.build-id\//d' \
           -e '/__pycache__/d' \
-          files
+          file_list
     displayName: Get list of files from RPM packages
 
   - script: |
@@ -243,7 +243,7 @@ jobs:
     displayName: Install PKI with CMake
 
   - script: |
-      readarray -t files < files
+      readarray -t files < file_list
       docker exec runner ls -ld "${files[@]}"
     displayName: Compare CMake and RPM files
 
diff --git a/base/console/CMakeLists.txt b/base/console/CMakeLists.txt
index 3886f9fc2d6..87b418288c7 100644
--- a/base/console/CMakeLists.txt
+++ b/base/console/CMakeLists.txt
@@ -2,8 +2,6 @@ project(console NONE)
 
 # build console classes
 javac(pki-console-classes
-    DEPENDS
-        pki-common-jar
     SOURCES
         src/main/java/*.java
     CLASSPATH
@@ -16,6 +14,8 @@ javac(pki-console-classes
         ${JSS_JAR} ${COMMONS_CODEC_JAR}
     OUTPUT_DIR
         ${CMAKE_CURRENT_BINARY_DIR}/classes
+    DEPENDS
+        pki-common-jar
 )
 
 set(PKI_CONSOLE_JAR ${CMAKE_BINARY_DIR}/dist/pki-console.jar
diff --git a/base/est/CMakeLists.txt b/base/est/CMakeLists.txt
index 77e338936ae..6f93d256348 100644
--- a/base/est/CMakeLists.txt
+++ b/base/est/CMakeLists.txt
@@ -20,10 +20,10 @@ javac(pki-est-classes
         ${PKI_TOMCAT_JAR}
         ${PKI_TOMCAT_9_0_JAR}
         ${PKI_SERVER_JAR}
-    DEPENDS
-        pki-server-jar
     OUTPUT_DIR
         ${CMAKE_CURRENT_BINARY_DIR}/classes
+    DEPENDS
+        pki-server-jar
 )
 
 set(PKI_EST_JAR ${CMAKE_BINARY_DIR}/dist/pki-est.jar
diff --git a/base/server-webapp/CMakeLists.txt b/base/server-webapp/CMakeLists.txt
index 9a626f22408..a6108809ff2 100644
--- a/base/server-webapp/CMakeLists.txt
+++ b/base/server-webapp/CMakeLists.txt
@@ -2,8 +2,6 @@ project(server-webapp)
 
 # build server-webapp classes
 javac(pki-server-webapp-classes
-    DEPENDS
-        pki-server-jar
     SOURCES
         src/main/java/*.java
     CLASSPATH
@@ -16,6 +14,8 @@ javac(pki-server-webapp-classes
         ${PKI_SERVER_JAR}
     OUTPUT_DIR
         ${CMAKE_CURRENT_BINARY_DIR}/classes
+    DEPENDS
+        pki-server-jar
 )
 
 set(PKI_SERVER_WEBAPP_JAR ${CMAKE_BINARY_DIR}/dist/pki-server-webapp.jar
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index fb359438cb6..3a592e68521 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -61,8 +61,6 @@ jar(pki-server-jar
 if(RUN_TESTS)
     # build pki-server-test
     javac(pki-server-test-classes
-        DEPENDS
-            pki-common-test-classes pki-common-jar pki-server-jar
         SOURCES
             src/test/java/*.java
         CLASSPATH
@@ -77,11 +75,11 @@ if(RUN_TESTS)
             ${OPENTEST4J_JAR} ${JAXRS_API_JAR}
         OUTPUT_DIR
             ${CMAKE_BINARY_DIR}/test/classes
+        DEPENDS
+            pki-common-test-classes pki-common-jar pki-server-jar
     )
 
     add_junit_test(test-pki-server
-        DEPENDS
-            pki-server-test-classes
         CLASSPATH
             ${SLF4J_API_JAR} ${SLF4J_SIMPLE_JAR}
             ${PKI_COMMON_JAR} ${PKI_SERVER_JAR}
@@ -96,6 +94,8 @@ if(RUN_TESTS)
             ${OPENTEST4J_JAR} ${JAXRS_API_JAR}
         REPORTS_DIR
             reports
+        DEPENDS
+            pki-server-test-classes
     )
 endif(RUN_TESTS)
 
diff --git a/base/tks/CMakeLists.txt b/base/tks/CMakeLists.txt
index a1be005f966..f14ea449d21 100644
--- a/base/tks/CMakeLists.txt
+++ b/base/tks/CMakeLists.txt
@@ -27,7 +27,9 @@ javac(pki-tks-classes
         pki-server-jar
 )
 
-set(PKI_TKS_JAR ${CMAKE_BINARY_DIR}/dist/pki-tks.jar CACHE INTERNAL "pki-tks.jar")
+set(PKI_TKS_JAR ${CMAKE_BINARY_DIR}/dist/pki-tks.jar
+    CACHE INTERNAL "pki-tks.jar"
+)
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources/META-INF/MANIFEST.MF
diff --git a/base/tools/CMakeLists.txt b/base/tools/CMakeLists.txt
index 712db301fc5..fa0f2c4cefc 100644
--- a/base/tools/CMakeLists.txt
+++ b/base/tools/CMakeLists.txt
@@ -26,7 +26,7 @@ javac(pki-tools-classes
     OUTPUT_DIR
         ${CMAKE_CURRENT_BINARY_DIR}/classes
     DEPENDS
-        pki-common-jar tkstool
+        pki-common-jar
 )
 
 set(PKI_TOOLS_JAR ${CMAKE_BINARY_DIR}/dist/pki-tools.jar
diff --git a/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt
index b15e916d8e8..c27a6256676 100644
--- a/base/tps/CMakeLists.txt
+++ b/base/tps/CMakeLists.txt
@@ -35,8 +35,6 @@ configure_file(
 )
 
 jar(pki-tps-jar
-    DEPENDS
-        pki-tps-classes
     CREATE
         ${PKI_TPS_JAR}
     OPTIONS
@@ -45,6 +43,8 @@ jar(pki-tps-jar
         ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.MF
     INPUT_DIR
         ${CMAKE_CURRENT_BINARY_DIR}/classes
+    DEPENDS
+        pki-tps-classes
 )
 
 # TPS does not support admin console.