Skip to content

Commit

Permalink
windows makevars was not happy in gh actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivann Schlosser authored and Ivann Schlosser committed Jul 18, 2024
1 parent 05c1d59 commit 8a2f3e4
Showing 1 changed file with 17 additions and 19 deletions.
36 changes: 17 additions & 19 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,21 @@ PKG_CPPFLAGS = -Ilibosmium/include -Iprotozero/include
$(SHLIB): libosmium protozero

protozero:
(cd protozero; \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:bool=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
$(MAKE))



(cd protozero; \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:bool=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
$(MAKE))

libosmium:
(cd libosmium; \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:bool=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
$(MAKE))
(cd libosmium; \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:bool=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
$(MAKE))

0 comments on commit 8a2f3e4

Please sign in to comment.