Correct namespace handling

1 files changed, 25 insertions, 24 deletions

diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index b4edcc9..9df2b4b 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -57,17 +57,17 @@ macro (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
 
 ##include (${BINARY_DIR}/${JPEG_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target jpeg-static
-  add_library(jpeg-static STATIC IMPORTED)
-  HDF_IMPORT_SET_LIB_OPTIONS (jpeg-static "jpeg" STATIC "")
-  add_dependencies (jpeg-static JPEG)
-  set (JPEG_STATIC_LIBRARY "jpeg-static")
+  add_library(${HDF_PACKAGE_NAMESPACE}jpeg-static STATIC IMPORTED)
+  HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}jpeg-static "jpeg" STATIC "")
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}jpeg-static JPEG)
+  set (JPEG_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}jpeg-static")
   set (JPEG_LIBRARIES ${JPEG_STATIC_LIBRARY})
   if (BUILD_SHARED_LIBS)
     # Create imported target jpeg-shared
-    add_library(jpeg-shared SHARED IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (jpeg-shared "jpeg" SHARED "")
-    add_dependencies (jpeg-shared JPEG)
-    set (JPEG_SHARED_LIBRARY "jpeg-shared")
+    add_library(${HDF_PACKAGE_NAMESPACE}jpeg-shared SHARED IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}jpeg-shared "jpeg" SHARED "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}jpeg-shared JPEG)
+    set (JPEG_SHARED_LIBRARY "${HDF_PACKAGE_NAMESPACE}jpeg-shared")
     set (JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_SHARED_LIBRARY})
   endif ()
 
@@ -136,17 +136,17 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
 
 ##include (${BINARY_DIR}/${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target szip-static
-  add_library(szip-static STATIC IMPORTED)
-  HDF_IMPORT_SET_LIB_OPTIONS (szip-static "szip" STATIC "")
-  add_dependencies (szip-static SZIP)
-  set (SZIP_STATIC_LIBRARY "szip-static")
+  add_library(${HDF_PACKAGE_NAMESPACE}szip-static STATIC IMPORTED)
+  HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-static "szip" STATIC "")
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-static SZIP)
+  set (SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-static")
   set (SZIP_LIBRARIES ${SZIP_STATIC_LIBRARY})
   if (BUILD_SHARED_LIBS)
     # Create imported target szip-shared
-    add_library(szip-shared SHARED IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (szip-shared "szip" SHARED "")
-    add_dependencies (szip-shared SZIP)
-    set (SZIP_SHARED_LIBRARY "szip-shared")
+    add_library(${HDF_PACKAGE_NAMESPACE}szip-shared SHARED IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}szip-shared "szip" SHARED "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}szip-shared SZIP)
+    set (SZIP_SHARED_LIBRARY "${HDF_PACKAGE_NAMESPACE}szip-shared")
     set (SZIP_LIBRARIES ${SZIP_LIBRARIES} ${SZIP_SHARED_LIBRARY})
   endif ()
 
@@ -218,17 +218,18 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
   endif ()
 ##include (${BINARY_DIR}/${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target zlib-static
-  add_library(zlib-static STATIC IMPORTED)
-  HDF_IMPORT_SET_LIB_OPTIONS (zlib-static ${ZLIB_LIB_NAME} STATIC "")
-  add_dependencies (zlib-static ZLIB)
-  set (ZLIB_STATIC_LIBRARY "zlib-static")
+  add_library(${HDF_PACKAGE_NAMESPACE}zlib-static STATIC IMPORTED)
+#  add_library(${HDF_PACKAGE_NAMESPACE}zlib-static ALIAS zlib-static)
+  HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}zlib-static ${ZLIB_LIB_NAME} STATIC "")
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static ZLIB)
+  set (ZLIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-static")
   set (ZLIB_LIBRARIES ${ZLIB_STATIC_LIBRARY})
   if (BUILD_SHARED_LIBS)
     # Create imported target zlib-shared
-    add_library(zlib-shared SHARED IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (zlib-shared ${ZLIB_LIB_NAME} SHARED "")
-    add_dependencies (zlib-shared ZLIB)
-    set (ZLIB_SHARED_LIBRARY "zlib-shared")
+    add_library(${HDF_PACKAGE_NAMESPACE}zlib-shared SHARED IMPORTED)
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}zlib-shared ${ZLIB_LIB_NAME} SHARED "")
+    add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-shared ZLIB)
+    set (ZLIB_SHARED_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-shared")
     set (ZLIB_LIBRARIES ${ZLIB_LIBRARIES} ${ZLIB_SHARED_LIBRARY})
   endif ()