Consolidate all the CMake-built C++ libs into one using the OBJECT li…

…brary feature post 2.8.8
geoclustc · Sep 11, 2013 · bd7569a · bd7569a
1 parent 0c26d27
commit bd7569a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # -*- mode: cmake -*-
-# Require cmake 2.8 or higher
-cmake_minimum_required(VERSION 2.8.2)
+# Require cmake 2.8.8 or higher
+cmake_minimum_required(VERSION 2.8.8)
 
 #set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 #set(CMAKE_DISABLE_SOURCE_CHANGES ON)

diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
@@ -28,6 +28,14 @@ add_subdirectory(${FBOXDIR})
 add_subdirectory(${FMGDIR})
 
 add_subdirectory(${CFMGDIR})
+
+add_library(cboxlib $<TARGET_OBJECTS:box_c> $<TARGET_OBJECTS:box_cbndry> $<TARGET_OBJECTS:box_camr> $<TARGET_OBJECTS:box_cmg> $<TARGET_OBJECTS:box_ctmg> $<TARGET_OBJECTS:box_cfmg>) 
+add_library(cfboxlib $<TARGET_OBJECTS:box_cfmg>) 
+add_install_library(cboxlib)
+add_install_library(cfboxlib)
+SET_TARGET_PROPERTIES(cboxlib PROPERTIES LINKER_LANGUAGE C)
+SET_TARGET_PROPERTIES(cfboxlib PROPERTIES LINKER_LANGUAGE C)
+
 add_subdirectory(${CAMRDATADIR})
 
 add_subdirectory(Extern/gslib)

diff --git a/Src/C_AMRLib/CMakeLists.txt b/Src/C_AMRLib/CMakeLists.txt
@@ -39,10 +39,9 @@ preprocess_boxlib_fortran(FPP_out_files ${FPP_source_files})
 
 set(local_source_files ${FPP_out_files} ${F77_source_files} ${F90_source_files} ${CXX_source_files})
 set(local_header_files ${CXX_header_files} ${F77_header_files} ${FPP_header_files} ${F90_header_files})
-add_library(box_camr ${local_source_files})
+add_library(box_camr OBJECT ${local_source_files})
 
 add_install_include_file(${local_header_files})
-add_install_library(box_camr)
 
 if (BUILD_TESTS)
 

diff --git a/Src/C_BaseLib/CMakeLists.txt b/Src/C_BaseLib/CMakeLists.txt
@@ -27,10 +27,9 @@ set(F90_header_files)
 preprocess_boxlib_fortran(FPP_out_files ${FPP_source_files})
 set(local_source_files ${CXX_source_files} ${F77_source_files} ${FPP_out_files} ${F90_source_files})
 set(local_header_files ${CXX_header_files} ${F77_header_files} ${FPP_header_files} ${F90_header_files})
-add_library(box_c ${local_source_files})
+add_library(box_c OBJECT ${local_source_files})
 
 add_install_include_file(${local_header_files})
-add_install_library(box_c)
 
 #if (BUILD_TESTS AND BL_SPACEDIM EQUAL 3)
 #   # Add UnitTest include directories

diff --git a/Src/C_BoundaryLib/CMakeLists.txt b/Src/C_BoundaryLib/CMakeLists.txt
@@ -27,10 +27,9 @@ set(F90_header_files)
 preprocess_boxlib_fortran(FPP_out_files ${FPP_source_files})
 set(local_source_files ${CXX_source_files} ${F77_source_files} ${FPP_out_files} ${F90_source_files})
 set(local_header_files ${CXX_header_files} ${F77_header_files} ${FPP_header_files} ${F90_header_files})
-add_library(box_cbndry ${local_source_files})
+add_library(box_cbndry OBJECT ${local_source_files})
 
 add_install_include_file(${local_header_files})
-add_install_library(box_cbndry)
 
 if (BUILD_TESTS)
 

diff --git a/Src/LinearSolvers/C_CellMG/CMakeLists.txt b/Src/LinearSolvers/C_CellMG/CMakeLists.txt
@@ -30,10 +30,9 @@ preprocess_boxlib_fortran(FPP_out_files ${FPP_source_files})
 
 set(local_source_files ${FPP_out_files} ${F77_source_files} ${F90_source_files} ${CXX_source_files})
 set(local_header_files ${FPP_header_files} ${F77_header_files} ${F90_header_files} ${CXX_header_files})
-add_library(box_cmg ${local_source_files})
+add_library(box_cmg OBJECT ${local_source_files})
 
 add_install_include_file(${local_header_files})
-add_install_library(box_cmg)
 
 if (BUILD_TESTS)
 

diff --git a/Src/LinearSolvers/C_TensorMG/CMakeLists.txt b/Src/LinearSolvers/C_TensorMG/CMakeLists.txt
@@ -33,10 +33,9 @@ preprocess_boxlib_fortran(FPP_out_files ${FPP_source_files})
 
 set(local_source_files ${FPP_out_files} ${F77_source_files} ${F90_source_files} ${CXX_source_files})
 set(local_header_files ${FPP_header_files} ${F77_header_files} ${F90_header_files} ${CXX_header_files})
-add_library(box_ctmg ${local_source_files})
+add_library(box_ctmg OBJECT ${local_source_files})
 
 add_install_include_file(${local_header_files})
-add_install_library(box_ctmg)
 
 if (BUILD_TESTS)
 

diff --git a/Src/LinearSolvers/C_to_F_MG/CMakeLists.txt b/Src/LinearSolvers/C_to_F_MG/CMakeLists.txt
@@ -30,10 +30,9 @@ preprocess_boxlib_fortran(FPP_out_files ${FPP_source_files})
 
 set(local_source_files ${FPP_out_files} ${F77_source_files} ${F90_source_files} ${CXX_source_files})
 set(local_header_files ${FPP_header_files} ${F77_header_files} ${F90_header_files} ${CXX_header_files})
-add_library(box_cfmg ${local_source_files})
+add_library(box_cfmg OBJECT ${local_source_files})
 
 add_install_include_file(${local_header_files})
-add_install_library(box_cfmg)
 
 if (BUILD_TESTS)
 

diff --git a/Src/LinearSolvers/F_MG/CMakeLists.txt b/Src/LinearSolvers/F_MG/CMakeLists.txt
@@ -34,7 +34,6 @@ add_library(box_fmg ${local_source_files})
 target_link_libraries(box_fmg box_f)
 
 add_install_include_file(${local_header_files})
-add_install_library(box_fmg)
 
 if (BUILD_TESTS AND BL_SPACEDIM EQUAL 3)
 endif()