Merge pull request #4557 from telefonicaid/hardening/optimize-cmakeli…

…sttxt
telefonicaid · May 31, 2024 · 69021c3 · 69021c3
2 parents 41ad0fe + 606e5c6
commit 69021c3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -238,18 +238,24 @@ find_package (mongoc-1.0 1.24.3 EXACT)
 find_library (HAVE_CJEXL cjexl PATHS /usr/lib /usr/lib64 /usr/local/lib64 /usr/local/lib)
 if (HAVE_CJEXL)
     message("Using cjexl")
+    SET (COMMON_STATIC_LIBS
+        microhttpd.a
+        mosquitto.a
+        ${HAVE_CJEXL}
+        mongo::mongoc_static
+    )
 else (HAVE_CJEXL)
     message("Not using cjexl")
     add_definitions(-DEXPR_BASIC)
+    SET (COMMON_STATIC_LIBS
+        microhttpd.a
+        mosquitto.a
+        mongo::mongoc_static
+    )
 endif (HAVE_CJEXL)
 
 # Static libs common to contextBroker and unitTest binaries
-SET (COMMON_STATIC_LIBS
-    microhttpd.a
-    mosquitto.a
-    ${HAVE_CJEXL}
-    mongo::mongoc_static
-)
+
 
 SET (DYNAMIC_LIBS
     curl

diff --git a/src/lib/serviceRoutinesV2/CMakeLists.txt b/src/lib/serviceRoutinesV2/CMakeLists.txt
@@ -55,12 +55,12 @@ getRegistrations.cpp
 optionsGetOnly.cpp
 optionsGetPostOnly.cpp
 postRegistration.cpp
-optionsGetDeleteOnly
-optionsAllNotDelete
-optionsGetPutOnly
-optionsGetPutDeleteOnly
-optionsGetDeletePatchOnly
-optionsPostOnly
+optionsGetDeleteOnly.cpp
+optionsAllNotDelete.cpp
+optionsGetPutOnly.cpp
+optionsGetPutDeleteOnly.cpp
+optionsGetDeletePatchOnly.cpp
+optionsPostOnly.cpp
 serviceRoutinesCommon.cpp
 )