Fixing cmake files to build everything into only one library. (c2d74e44) · Commits · TNL / tnl-dev

buildAll

+1 −1

Original line number	Diff line number	Diff line
		#!/bin/bash

		INSTALL_PREFIX=${HOME}/local
		WITH_CUDA=yes
		WITH_CUDA=no
		CUDA_ARCHITECTURE=2.0
		VERBOSE=0

src/CMakeLists.txt

+21 −22

Original line number	Diff line number	Diff line
		@@ -8,31 +8,30 @@ ADD_SUBDIRECTORY( matrix )
		ADD_SUBDIRECTORY( mesh )
		ADD_SUBDIRECTORY( solver )


		ADD_LIBRARY( tnl${debugExt}-${tnlVersion} SHARED dummy.cpp )
		SET_TARGET_PROPERTIES( tnl${debugExt}-${tnlVersion} PROPERTIES SOVERSION 0
		ADD_LIBRARY( tnl${debugExt}-${tnlVersion} SHARED
		${tnl_config_SOURCES}
		${tnl_core_SOURCES}
		${tnl_debug_SOURCES}
		${tnl_matrix_SOURCES} )
		SET_TARGET_PROPERTIES( tnl${debugExt}-${tnlVersion} PROPERTIES
		SOVERSION 0
		VERSION ${tnlVersion} )
		TARGET_LINK_LIBRARIES( tnl${debugExt}-${tnlVersion} tnlconfig${debugExt}-${tnlVersion}
		tnlcore${debugExt}-${tnlVersion}
		tnldebug${debugExt}-${tnlVersion}
		tnldiff${debugExt}-${tnlVersion}
		tnlmatrix${debugExt}-${tnlVersion}
		tnlmesh${debugExt}-${tnlVersion}
		tnlsolver${debugExt}-${tnlVersion} )
		TARGET_LINK_LIBRARIES( tnl${debugExt}-${tnlVersion}
		${BZIP2_LIBRARIES} )
		INSTALL( TARGETS tnl${debugExt}-${tnlVersion} DESTINATION lib )

		IF( BUILD_MPI )
		ADD_LIBRARY( tnl-mpi${debugExt}-${tnlVersion} SHARED dummy.cpp )
		SET_TARGET_PROPERTIES( tnl-mpi${debugExt}-${tnlVersion} PROPERTIES SOVERSION 0
		ADD_LIBRARY( tnl-mpi${debugExt}-${tnlVersion} SHARED
		${tnl_config_SOURCES}
		${tnl_core_SOURCES}
		${tnl_debug_SOURCES}
		${tnl_matrix_SOURCES} )
		SET_TARGET_PROPERTIES( tnl-mpi${debugExt}-${tnlVersion} PROPERTIES
		SOVERSION 0
		VERSION ${tnlVersion} )
		TARGET_LINK_LIBRARIES( tnl-mpi${debugExt}-${tnlVersion} ${MPI_LIBRARIES}
		tnlconfig-mpi${debugExt}-${tnlVersion}
		tnlcore-mpi${debugExt}-${tnlVersion}
		tnldebug-mpi${debugExt}-${tnlVersion}
		tnldiff-mpi${debugExt}-${tnlVersion}
		tnlmatrix-mpi${debugExt}-${tnlVersion}
		tnlmesh-mpi${debugExt}-${tnlVersion}
		tnlsolver-mpi${debugExt}-${tnlVersion} )
		TARGET_LINK_LIBRARIES( tnl-mpi${debugExt}-${tnlVersion}
		${MPI_LIBRARIES}
		${BZIP2_LIBRARIES} )
		INSTALL( TARGETS tnl-mpi${debugExt}-${tnlVersion} DESTINATION lib )
		ENDIF()

src/config/CMakeLists.txt

+8 −18

Original line number	Diff line number	Diff line
		@@ -10,24 +10,14 @@ SET( headers tnlConfigDescription.h
		tnlParameterContainer.h
		FlexLexer.h
		)
		SET( sources tnlConfigDescription.cpp
		tnlConfigDescriptionScanner.cpp
		tnlConfigDescriptionParser.cpp
		tnlParameterContainer.cpp
		parse.cc
		)

		SET( libmconfigincludedir ${TNL_INCLUDE_DIR}/config )
		SET( libmconfiginclude_HEADERS ${headers} )
		SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/config )
		SET( tnl_config_SOURCES
		${CURRENT_DIR}/tnlConfigDescription.cpp
		${CURRENT_DIR}/tnlConfigDescriptionScanner.cpp
		${CURRENT_DIR}/tnlConfigDescriptionParser.cpp
		${CURRENT_DIR}/tnlParameterContainer.cpp
		${CURRENT_DIR}/parse.cc
		PARENT_SCOPE )

		ADD_LIBRARY( tnlconfig${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/config )
		INSTALL( TARGETS tnlconfig${debugExt}-${tnlVersion} DESTINATION lib )

		if( BUILD_MPI )
		ADD_LIBRARY( tnlconfig-mpi${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		SET_TARGET_PROPERTIES( tnlconfig-mpi${debugExt}-${tnlVersion} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}" )
		INSTALL( TARGETS tnlconfig-mpi${debugExt}-${tnlVersion} DESTINATION lib )
		endif()

src/core/CMakeLists.txt

+26 −22

Original line number	Diff line number	Diff line
		@@ -29,31 +29,35 @@ set (headers tnlArray.h
		mpi-supp.h
		param-types.h
		)
		set( sources tnlFile.cpp
		tnlFlopsCounter.cpp
		tnlLogger.cpp
		tnlObject.cpp
		tnlStatistics.cpp
		tnlString.cpp
		tnlTimerCPU.cpp
		tnlTimerRT.cpp
		mfilename.cpp
		mpi-supp.cpp
		)

		SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/core )
		set( tnl_core_SOURCES
		${CURRENT_DIR}/tnlFile.cpp
		${CURRENT_DIR}/tnlFlopsCounter.cpp
		${CURRENT_DIR}/tnlLogger.cpp
		${CURRENT_DIR}/tnlObject.cpp
		${CURRENT_DIR}/tnlStatistics.cpp
		${CURRENT_DIR}/tnlString.cpp
		${CURRENT_DIR}/tnlTimerCPU.cpp
		${CURRENT_DIR}/tnlTimerRT.cpp
		${CURRENT_DIR}/mfilename.cpp
		${CURRENT_DIR}/mpi-supp.cpp
		PARENT_SCOPE )

		SET( libtnlcoreincludedir ${TNL_INCLUDE_DIR}/core )
		SET( libtnlcoreinclude_HEADERS ${headers} )
		INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/core )

		ADD_LIBRARY( tnlcore${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		TARGET_LINK_LIBRARIES( tnlcore${debugExt}-${tnlVersion} ${BZIP2_LIBRARIES} )
		INSTALL( TARGETS tnlcore${debugExt}-${tnlVersion} DESTINATION lib )
		#ADD_LIBRARY( tnlcore${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		#TARGET_LINK_LIBRARIES( tnlcore${debugExt}-${tnlVersion} ${BZIP2_LIBRARIES} )
		#INSTALL( TARGETS tnlcore${debugExt}-${tnlVersion} DESTINATION lib )

		#IF( BUILD_MPI )
		# ADD_LIBRARY( tnlcore-mpi${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		# TARGET_LINK_LIBRARIES( tnlcore-mpi${debugExt}-${tnlVersion} ${MPI_LIBRARIES}
		# ${BZIP2_LIBRARIES} )
		# SET_TARGET_PROPERTIES( tnlcore-mpi${debugExt}-${tnlVersion} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}" )
		# INSTALL( TARGETS tnlcore-mpi${debugExt}-${tnlVersion} DESTINATION lib )
		#ENDIF()

		IF( BUILD_MPI )
		ADD_LIBRARY( tnlcore-mpi${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		TARGET_LINK_LIBRARIES( tnlcore-mpi${debugExt}-${tnlVersion} ${MPI_LIBRARIES}
		${BZIP2_LIBRARIES} )
		SET_TARGET_PROPERTIES( tnlcore-mpi${debugExt}-${tnlVersion} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}" )
		INSTALL( TARGETS tnlcore-mpi${debugExt}-${tnlVersion} DESTINATION lib )
		ENDIF()

		INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/core )

src/debug/CMakeLists.txt

+19 −22

Original line number	Diff line number	Diff line
		@@ -2,13 +2,6 @@ SET( EXTRA_DIST tnlDebugParser.y
		tnlDebugScanner.l
		create-tnl-debug-parser )

		SET( sources tnlDebug.cpp
		tnlDebugGroup.cpp
		tnlDebugStructure.cpp
		tnlDebugParser.cpp
		tnlDebugScanner.cpp
		parse.cc )

		SET(headers tnlDbgDataElement.h
		tnlDebugEntry.h
		tnlDebugGroup.h
		@@ -18,21 +11,25 @@ SET(headers tnlDbgDataElement.h
		tnlDebugScanner.h
		tnlDebugStructure.h )

		ADD_LIBRARY( tnldebug${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		ADD_EXECUTABLE( tnl-debug-test tnl-debug-test.cpp )
		TARGET_LINK_LIBRARIES( tnl-debug-test tnldebug${debugExt}-${tnlVersion})
		INSTALL( TARGETS tnldebug${debugExt}-${tnlVersion} DESTINATION lib )
		SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/debug )
		SET( tnl_debug_SOURCES
		# ${CURRENT_DIR}/tnlDebug.cpp
		# ${CURRENT_DIR}/tnlDebugGroup.cpp
		# ${CURRENT_DIR}/tnlDebugStructure.cpp
		# ${CURRENT_DIR}/tnlDebugParser.cpp
		# ${CURRENT_DIR}/tnlDebugScanner.cpp
		# ${CURRENT_DIR}/parse.cc
		PARENT_SCOPE )

		IF( BUILD_MPI )
		ADD_LIBRARY( tnldebug-mpi${debugExt}-${tnlVersion} SHARED ${sources} ${headers} )
		SET_TARGET_PROPERTIES( tnldebug-mpi${debugExt}-${tnlVersion} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}" )
		INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/debug )

		ADD_EXECUTABLE( tnl-debug-test-mpi tnl-debug-test.cpp )
		TARGET_LINK_LIBRARIES( tnl-debug-test-mpi tnldebug-mpi${debugExt}-${tnlVersion})
		SET_TARGET_PROPERTIES( tnl-debug-test-mpi PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}" )
		#ADD_EXECUTABLE( tnl-debug-test tnl-debug-test.cpp )
		#TARGET_LINK_LIBRARIES( tnl-debug-test tnldebug${debugExt}-${tnlVersion})

		INSTALL( TARGETS tnldebug-mpi${debugExt}-${tnlVersion} DESTINATION lib )
		ENDIF()
		IF( BUILD_MPI )
		#ADD_EXECUTABLE( tnl-debug-test-mpi tnl-debug-test.cpp )
		#TARGET_LINK_LIBRARIES( tnl-debug-test-mpi tnldebug-mpi${debugExt}-${tnlVersion})
		#SET_TARGET_PROPERTIES( tnl-debug-test-mpi PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}" )

		ENDIF()

		No newline at end of file
		INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/debug )
		No newline at end of file