Skip to content

Commit 1f54bdb

Browse files
committed
fix make issue on linux with gcc
1 parent f556e24 commit 1f54bdb

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

examples/QT/SioChatDemo/SioChatDemo.pro

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,15 @@ CONFIG(debug, debug|release):DEFINES +=DEBUG=1
3030
INCLUDEPATH += $$PWD/../../../build/include
3131
DEPENDPATH += $$PWD/../../../build/lib
3232

33-
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lsioclient
34-
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lsioclient
35-
else:unix: LIBS += -L$$PWD/../../../build/lib/release -lsioclient
33+
CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lsioclient
34+
else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lsioclient
3635

3736

38-
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lboost_random
39-
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lboost_random
40-
else:unix: LIBS += -L$$PWD/../../../build/lib/release -lboost_random
37+
CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lboost_random
38+
else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lboost_random
4139

42-
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lboost_system
43-
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lboost_system
44-
else:unix: LIBS += -L$$PWD/../../../build/lib/release -lboost_system
40+
CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lboost_system
41+
else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lboost_system
4542

46-
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/release/ -lboost_date_time
47-
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/debug/ -lboost_date_time
48-
else:unix: LIBS += -L$$PWD/../../../build/lib/release -lboost_date_time
43+
CONFIG(release, debug|release): LIBS += -L$$PWD/../../../build/lib/Release/ -lboost_date_time
44+
else:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../build/lib/Debug/ -lboost_date_time

test/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
cmake_minimum_required(VERSION 2.8)
1+
cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
22
include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
33
find_package(Boost ${BOOST_VER} REQUIRED COMPONENTS unit_test_framework)
44
add_executable(sio_test sio_test.cpp)
5+
set_property(TARGET sio_test PROPERTY CXX_STANDARD 11)
6+
set_property(TARGET sio_test PROPERTY CXX_STANDARD_REQUIRED ON)
57
target_link_libraries(sioclient PRIVATE ${Boost_LIBRARIES})
68
target_link_libraries(sio_test sioclient)
79
target_include_directories(sio_test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src" ${Boost_INCLUDE_DIRS} )

0 commit comments

Comments
 (0)