Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
dcdb
dcdb
Commits
70815de8
Commit
70815de8
authored
Jan 30, 2018
by
Michael Ott
Browse files
Make cmake use CC and CXX that are first in $PATH, not the ones in /usr/bin
parent
8d84b2fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
70815de8
...
...
@@ -45,6 +45,9 @@ endif
PUBHEADERS
=
pusherpqueue.h dcdbdaemon.h
FULL_CC
=
$(
shell
which
$(CC)
)
FULL_CXX
=
$(
shell
which
$(CXX)
)
.PHONY
:
info all clean cleanall distclean check-cross-compile deps depsinstall $(SUB_DIRS)
info
:
...
...
@@ -128,7 +131,7 @@ $(DCDBDEPSPATH)/mosquitto-$(MOSQUITTO_VERSION)/.built: $(DCDBDEPSPATH)/mosquitto
@
echo
"Building Mosquitto library..."
;
mkdir
-p
$(DCDBDEPSPATH)
/mosquitto_build
;
cd
$(DCDBDEPSPATH)
/mosquitto_build
&&
\
cmake
$(CMAKE_CROSS_FLAGS)
\
CC
=
$(FULL_CC)
CXX
=
$(FULL_CXX)
cmake
$(CMAKE_CROSS_FLAGS)
\
-DOPENSSL_ROOT_DIR
=
$(DCDBDEPLOYPATH)
/
\
-DWITH_SRV
=
no
\
-DWITH_TLS
=
yes
\
...
...
@@ -174,7 +177,7 @@ $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-
@
echo
"Building cpp-driver..."
mkdir
-p
$(DCDBDEPSPATH)
/cpp-driver_build
cd
$(DCDBDEPSPATH)
/cpp-driver_build
&&
\
cmake
$(CMAKE_CROSS_FLAGS)
\
CC
=
$(FULL_CC)
CXX
=
$(FULL_CXX)
cmake
$(CMAKE_CROSS_FLAGS)
\
-DCMAKE_CXX_FLAGS
=
"
$(CXX11FLAGS)
-Wno-unused-command-line-argument -L
$(DCDBDEPLOYPATH)
/lib "
\
-DOPENSSL_ROOT_DIR
=
$(DCDBDEPSPATH)
/openssl-
$(OPENSSL_VERSION)
\
-DLIBUV_ROOT_DIR
=
$(DCDBDEPSPATH)
/libuv-v
$(LIBUV_VERSION)
\
...
...
@@ -194,7 +197,7 @@ $(DCDBDEPSPATH)/cpp-netlib-$(CPPNET_VERSION)/.built: $(DCDBDEPSPATH)/cpp-netlib-
@
echo
"Building cpp-netlib..."
mkdir
-p
$(DCDBDEPSPATH)
/cpp-netlib_build
cd
$(DCDBDEPSPATH)
/cpp-netlib_build
&&
\
cmake
$(CMAKE_CROSS_FLAGS)
\
CC
=
$(FULL_CC)
CXX
=
$(FULL_CXX)
cmake
$(CMAKE_CROSS_FLAGS)
\
-DCMAKE_CXX_FLAGS
=
"
$(CXX11FLAGS)
-Wno-unused-command-line-argument -L
$(DCDBDEPLOYPATH)
/lib "
\
-DCPP-NETLIB_ENABLE_HTTPS
=
off
\
-DCPP-NETLIB_BUILD_TESTS
=
OFF
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment