Added static library tnl_static.a

src/TNL/CMakeLists.txt

@@ -17,7 +17,7 @@ ADD_SUBDIRECTORY( legacy )
 
 SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/TNL )
 
-set( headers 
+set( headers
      Assert.h
      Constants.h
      CudaSharedMemory.h
@@ -42,7 +42,7 @@ set( headers
      Timer.h
      UniquePointer.h )
 
-set( common_SOURCES 
+set( common_SOURCES
      File.cpp
      FileName.cpp
      Object.cpp
@@ -50,7 +50,7 @@ set( common_SOURCES
      SmartPointersRegister.cpp
      String.cpp
      Timer.cpp )
-     
+
 set( tnl_SOURCES ${tnl_config_SOURCES}
                  ${tnl_containers_SOURCES}
                  ${tnl_devices_SOURCES}
@@ -63,8 +63,8 @@ set( tnl_SOURCES ${tnl_config_SOURCES}
                  ${tnl_solvers_SOURCES}
 
                  ${tnl_core_SOURCES}
-                 ${tnl_legacy_SOURCES}                 
-                                                   
+                 ${tnl_legacy_SOURCES}
+
                  ${common_SOURCES} )
 
 set( tnl_CUDA__SOURCES ${tnl_config_CUDA__SOURCES}
@@ -82,52 +82,54 @@ set( tnl_CUDA__SOURCES ${tnl_config_CUDA__SOURCES}
                        ${tnl_core_CUDA__SOURCES}
                        ${tnl_legacy_CUDA__SOURCES}
                        ${common_SOURCES} )
-                 
-                 
+
+
 if( BUILD_CUDA )
    CUDA_ADD_LIBRARY( tnl SHARED ${tnl_CUDA__SOURCES}
-                                                  OPTIONS ${CUDA_ADD_LIBRARY_OPTIONS} )
-    if( HAVE_CUBLAS )
-       CUDA_ADD_CUBLAS_TO_TARGET( tnl )
-    endif( HAVE_CUBLAS )
+                     OPTIONS ${CUDA_ADD_LIBRARY_OPTIONS} )
+   if( HAVE_CUBLAS )
+      CUDA_ADD_CUBLAS_TO_TARGET( tnl )
+   endif( HAVE_CUBLAS )
+   CUDA_ADD_LIBRARY( tnl_static STATIC ${tnl_CUDA__SOURCES} )
 else( BUILD_CUDA )
-   ADD_LIBRARY( tnl SHARED 
-                ${tnl_SOURCES} )
+   ADD_LIBRARY( tnl SHARED ${tnl_SOURCES} )
+   ADD_LIBRARY( tnl_static STATIC ${tnl_SOURCES} )
 #ifMIC
   #TARGET_COMPILE_DEFINITIONS( tnl PUBLIC -DHAVE_MIC )
-endif( BUILD_CUDA )                                    
-               
-SET_TARGET_PROPERTIES( tnl PROPERTIES 
+endif( BUILD_CUDA )
+
+SET_TARGET_PROPERTIES( tnl PROPERTIES
                        VERSION ${tnlVersion} )
-TARGET_LINK_LIBRARIES( tnl 
-                       ${DCMTK_LIBRARIES})
+TARGET_LINK_LIBRARIES( tnl
+                       ${DCMTK_LIBRARIES} )
 
 
-INSTALL( TARGETS tnl DESTINATION lib )
+INSTALL( TARGETS tnl tnl_static DESTINATION lib )
 
 IF( BUILD_MPI )
-   
+
    if( BUILD_CUDA )
-      CUDA_ADD_LIBRARY( tnl-mpi-${tnlVersion} SHARED ${tnl_CUDA__SOURCES} 
-                                                         OPTIONS ${CUDA_ADD_LIBRARY_OPTIONS} )
+      CUDA_ADD_LIBRARY( tnl-mpi SHARED ${tnl_CUDA__SOURCES}
+                        OPTIONS ${CUDA_ADD_LIBRARY_OPTIONS} )
       if( HAVE_CUBLAS )
-         CUDA_ADD_CUBLAS_TO_TARGET( tnl-mpi-${tnlVersion} )
+         CUDA_ADD_CUBLAS_TO_TARGET( tnl-mpi )
       endif( HAVE_CUBLAS )
+      CUDA_ADD_LIBRARY( tnl-mpi_static STATIC ${tnl_CUDA__SOURCES} )
    else( BUILD_CUDA )
-         ADD_LIBRARY( tnl-mpi-${tnlVersion} SHARED
-                      ${tnl_SOURCES} )  
-   endif( BUILD_CUDA )                        
-   
-   SET_TARGET_PROPERTIES( tnl-mpi-${tnlVersion} PROPERTIES
-                          VERSION ${tnlVersion} ) 
-#   SET_TARGET_PROPERTIES( tnl-mpi-${tnlVersion} 
+      ADD_LIBRARY( tnl-mpi SHARED ${tnl_SOURCES} )
+      ADD_LIBRARY( tnl-mpi_static STATIC ${tnl_SOURCES} )
+   endif( BUILD_CUDA )
+
+   SET_TARGET_PROPERTIES( tnl-mpi PROPERTIES
+                          VERSION ${tnlVersion} )
+#   SET_TARGET_PROPERTIES( tnl-mpi
 #                          LINK_INTERFACE_LIBRARIES "")
 
-   
-   TARGET_LINK_LIBRARIES( tnl-mpi-${tnlVersion} 
+
+   TARGET_LINK_LIBRARIES( tnl-mpi
                           ${MPI_LIBRARIES} )
-   INSTALL( TARGETS tnl-mpi-${tnlVersion} DESTINATION lib )
-                                                                
-ENDIF()
+   INSTALL( TARGETS tnl-mpi tnl-mpi_static DESTINATION lib )
+
+endif()
 
 INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY} )