Skip to content

Commit 970c9a3

Browse files
committed
teca_detect_nodes: add_custom_target to build tempestextremes
1 parent d38981f commit 970c9a3

File tree

5 files changed

+15
-53
lines changed

5 files changed

+15
-53
lines changed

alg/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,14 @@ endif()
113113

114114
add_library(teca_alg ${teca_alg_cxx_srcs} ${teca_alg_cuda_srcs} ${teca_alg_f90_srcs})
115115

116-
target_link_libraries(teca_alg teca_data teca_core ${teca_alg_link} "${CMAKE_SOURCE_DIR}/alg/third_party/tempestextremes/src/base/libextremesbase.a" "${CMAKE_SOURCE_DIR}/alg/third_party/tempestextremes/src/netcdf-cxx-4.2/libnetcdf_c++.a" ${NETCDF_LIBRARIES})
116+
add_custom_target(tempestextremes
117+
COMMAND make BUILDTEDIR=${CMAKE_BINARY_DIR}/tempestextremes -f ${CMAKE_SOURCE_DIR}/alg/third_party/tempestextremes/Makefile
118+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/alg/third_party/tempestextremes
119+
COMMENT "Building target tempestextremes")
120+
121+
add_dependencies(teca_alg tempestextremes)
122+
123+
target_link_libraries(teca_alg teca_data teca_core ${teca_alg_link} "${CMAKE_BINARY_DIR}/tempestextremes/libextremesbase.a" "${CMAKE_BINARY_DIR}/tempestextremes/libnetcdf_c++.a" ${NETCDF_LIBRARIES})
117124

118125
target_include_directories(teca_alg
119126
INTERFACE

alg/third_party/tempestextremes/Make.defs

Lines changed: 0 additions & 46 deletions
This file was deleted.

alg/third_party/tempestextremes/mk/rules.make

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
# Rules for compiling object files
88

99
# Compilation directories
10-
DEPDIR= $(CURDIR)/depend
11-
BUILDDIR= $(CURDIR)/build
10+
11+
DEPDIR= $(BUILDTEDIR)/$(notdir $(CURDIR))/depend
12+
BUILDDIR= $(BUILDTEDIR)/$(notdir $(CURDIR))/build
1213

1314
# Dependency file construction
1415
MAKEDEPENDCPP= \

alg/third_party/tempestextremes/src/base/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ FILES= SimpleGrid.cpp \
2929
MeshUtilities.cpp
3030

3131

32-
LIB_TARGET= libextremesbase.a
32+
LIB_TARGET= $(BUILDTEDIR)/libextremesbase.a
3333

3434
.PHONY: all clean
3535

@@ -38,7 +38,7 @@ all: $(LIB_TARGET)
3838

3939
$(LIB_TARGET): $(FILES:%.cpp=$(BUILDDIR)/%.o)
4040
rm -f $(LIB_TARGET)
41-
ar -cqs $(LIB_TARGET) build/*.o
41+
ar -cqs $(LIB_TARGET) $(BUILDDIR)/*.o
4242

4343
# Clean rules.
4444
clean:

alg/third_party/tempestextremes/src/netcdf-cxx-4.2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include $(TEMPESTEXTREMESDIR)/mk/framework.make
1212

1313
FILES= ncvalues.cpp netcdf.cpp
1414

15-
LIB_TARGET= libnetcdf_c++.a
15+
LIB_TARGET= $(BUILDTEDIR)/libnetcdf_c++.a
1616

1717
.PHONY: all clean
1818

@@ -21,7 +21,7 @@ all: $(LIB_TARGET)
2121

2222
$(LIB_TARGET): $(FILES:%.cpp=$(BUILDDIR)/%.o)
2323
rm -f $(LIB_TARGET)
24-
ar -cqs $(LIB_TARGET) build/*.o
24+
ar -cqs $(LIB_TARGET) $(BUILDDIR)/*.o
2525

2626
# Clean rules.
2727
clean:

0 commit comments

Comments
 (0)