From 95dcf870062e8a57cb5fdcd6b5b7f761d35e3c1a Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 26 Sep 2012 07:57:30 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@26745 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/Config.cmake.in | 4 +--- deal.II/config/Make.rules | 38 ---------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 deal.II/config/Make.rules diff --git a/deal.II/config/Config.cmake.in b/deal.II/config/Config.cmake.in index f96c2666fa..95cb4dcf67 100644 --- a/deal.II/config/Config.cmake.in +++ b/deal.II/config/Config.cmake.in @@ -39,6 +39,7 @@ SET(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_PROJECT_CONFIG_RELDIR}") # SET(DEAL_II_BUILD_TYPE "${CMAKE_BUILD_TYPE}") +SET(DEAL_II_BUILD_TYPES "${CMAKE_BUILD_TYPES}") SET(DEAL_II_CXX_COMPILER "${CMAKE_CXX_COMPILER}") SET(DEAL_II_CXX_FLAGS "${CMAKE_CXX_FLAGS}") @@ -54,9 +55,6 @@ SET(DEAL_II_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") SET(DEAL_II_LINKER_FLAGS_DEBUG "${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}") SET(DEAL_II_LINKER_FLAGS_RELEASE "${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}") -SET(DEAL_II_LINKER "${CMAKE_LINKER}") -SET(DEAL_II_AR "${CMAKE_AR}") - # # Information on where to find the deal.II libraries and headers # diff --git a/deal.II/config/Make.rules b/deal.II/config/Make.rules deleted file mode 100644 index ebfeba3ca8..0000000000 --- a/deal.II/config/Make.rules +++ /dev/null @@ -1,38 +0,0 @@ - - -############################################################ -# Include general settings for including DEAL libraries -############################################################ - -include $D/common/Make.global_options - - -############################################################ -# Targets for compilation -############################################################ - -ifneq ($(enable-threads),no) - MT = MT -else - MT = == -endif - -%.g.$(OBJEXT) : %.cc - @echo =====debug======$(MT)== $< - @$(CXX) $(CXXFLAGS.g) $(CXXFLAGS) -c $< -o $@ -%.$(OBJEXT) : %.cc - @echo =====optimized==$(MT)== $< - @$(CXX) $(CXXFLAGS.o) $(CXXFLAGS) -c $< -o $@ - -############################################################ -# Automatic generation of dependencies -############################################################ - -all-cc-files = $(shell echo *.cc) - -Makefile.depend: $(all-cc-files) - @echo =====Dependencies== Makefile.depend - @$(CXX) $(flags) $^ -M > $@ - @$(PERL) -pi~ -e 's/(^[^.]+)\.$(OBJEXT):/\1.$(OBJEXT) \1.g.$(OBJEXT):/;' $@ - -include Makefile.depend -- 2.39.5