From 53150028e8d4f941325526e567ba3da92efb603c Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 17:47:04 -0800 Subject: [PATCH 1/9] CMake: remove explicit gating on MINGW/MSVC Compilers like Clang are becoming available on Windows. If there's a requirement on something provided by only MINGW and MSVC, it should be specified directly. --- CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ad61c9..41d234d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,17 +40,8 @@ if(UNIX) add_definitions(-D_DARWIN) endif() elseif(WIN32) - add_definitions(-DWIN32) + add_definitions(-DWIN32 -D_WINSOCK_DEPRECATED_NO_WARNINGS) SET(PROJECT_LIBS Ws2_32.lib) - if(MINGW) - # Special MINGW stuff here - elseif(MSVC) - # Special MSVC stuff here - add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) - else() - # No idea what it is, but there's a good chance it's too weird. - MESSAGE( FATAL_ERROR "Using unknown WIN32 compiler... NOT. Please add to build system." ) - endif() endif() OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." ON) From 8944d36427c9557cfdba922e48777a725ffc39a1 Mon Sep 17 00:00:00 2001 From: Michael M Date: Mon, 30 Oct 2017 11:15:34 -0700 Subject: [PATCH 2/9] CMake: remove CLSOCKET_SHARED and CLSOCKET_DEP_ONLY - The CLSOCKET_SHARED logic is done for free by the standard CMake option BUILD_SHARED_LIBS. - The CLSOCKET_DEP_ONLY logic can be achieved by passing the EXCLUDE_FROM_ALL option to add_subdirectory when adding clsocket. --- CMakeLists.txt | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41d234d..5597983 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,32 +44,21 @@ elseif(WIN32) SET(PROJECT_LIBS Ws2_32.lib) endif() -OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." ON) -OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." OFF) +option(BUILD_SHARED_LIBS "Build libs as shared" ON) +if(DEFINED CLSOCKET_SHARED) + message(FATAL_ERROR "The CLSOCKET_SHARED option is deprecated, instead use BUILD_SHARED_LIBS.") +endif() +if(DEFINED CLSOCKET_DEP_ONLY) + message(FATAL_ERROR "The CLSOCKET_DEP_ONLY option is deprecated, instead use add_subdirectory() with EXCLUDE_FROM_ALL.") +endif() # make the lib -if(CLSOCKET_SHARED) - if(CLSOCKET_DEP_ONLY) - ADD_LIBRARY(clsocket SHARED EXCLUDE_FROM_ALL ${CLSOCKET_SOURCES}) - else() - ADD_LIBRARY(clsocket SHARED ${CLSOCKET_SOURCES}) - endif() -else() - if(CLSOCKET_DEP_ONLY) - ADD_LIBRARY(clsocket STATIC EXCLUDE_FROM_ALL ${CLSOCKET_SOURCES}) - else() - ADD_LIBRARY(clsocket STATIC ${CLSOCKET_SOURCES}) - endif() -endif() +add_library(clsocket ${CLSOCKET_SOURCES}) TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS}) # install into configured prefix -if(NOT CLSOCKET_DEP_ONLY) - install(TARGETS clsocket ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) - install(FILES ${CLSOCKET_HEADERS} DESTINATION include) -else() - -endif() +install(TARGETS clsocket ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) +install(FILES ${CLSOCKET_HEADERS} DESTINATION include) set_target_properties(clsocket PROPERTIES VERSION ${BUILD_VERSION} SOVERSION ${BUILD_MAJOR}) @@ -80,9 +69,7 @@ if(UNIX) if(CLSOCKET_EXAMPLES) ADD_EXECUTABLE(clsocket-example examples/RecvAsync.cpp) TARGET_LINK_LIBRARIES(clsocket-example clsocket pthread) - if(NOT CLSOCKET_DEP_ONLY) - install(TARGETS clsocket-example DESTINATION bin) - endif() + install(TARGETS clsocket-example DESTINATION bin) ADD_EXECUTABLE(querydaytime-example examples/QueryDayTime.cpp) TARGET_LINK_LIBRARIES(querydaytime-example clsocket) From 835d2be18247b56a80ed5ecbb1cb6ad0346af4d5 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 17:59:49 -0800 Subject: [PATCH 3/9] CMake: only specify library install destination once --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5597983..be67c13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ add_library(clsocket ${CLSOCKET_SOURCES}) TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS}) # install into configured prefix -install(TARGETS clsocket ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) +install(TARGETS clsocket DESTINATION lib) install(FILES ${CLSOCKET_HEADERS} DESTINATION include) set_target_properties(clsocket PROPERTIES VERSION ${BUILD_VERSION} From 3d92806767ea46705c1b43656da52ac265eac097 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 18:04:25 -0800 Subject: [PATCH 4/9] Replace _DARWIN, _LINUX, and WIN32 defines with system defines Global names beginning with an underscore are reserved, and each system already defines relevant macros: - All Linux and BSD targets (except Apple) define __unix__ - All Apple targets define __APPLE__ - All Windows targets define _WIN32 For more information, see http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system --- CMakeLists.txt | 16 +++------------- README | 3 --- examples/RecvAsync.cpp | 2 +- src/ActiveSocket.cpp | 6 +++--- src/Host.h | 22 +++++++++++----------- src/PassiveSocket.cpp | 6 +++--- src/SimpleSocket.cpp | 12 ++++++------ src/SimpleSocket.h | 10 +++++----- src/StatTimer.h | 6 +++--- 9 files changed, 35 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be67c13..feb94f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,19 +28,9 @@ SET_SOURCE_FILES_PROPERTIES( ${CLSOCKET_HEADERS} PROPERTIES HEADER_FILE_ONLY TRU # append to sources so that dependency checks work on headers LIST(APPEND CLSOCKET_SOURCES ${CLSOCKET_HEADERS}) -# OS and compiler checks. -if(UNIX) - # linux / normal unix - add_definitions(-D_LINUX) - if(CYGWIN) - # Special Cygwin stuff here - elseif(APPLE) - # Special Apple stuff here - remove_definitions(-D_LINUX) - add_definitions(-D_DARWIN) - endif() -elseif(WIN32) - add_definitions(-DWIN32 -D_WINSOCK_DEPRECATED_NO_WARNINGS) +# OS and compiler checks. +if(WIN32) + add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) SET(PROJECT_LIBS Ws2_32.lib) endif() diff --git a/README b/README index 9de2cab..a1fc085 100644 --- a/README +++ b/README @@ -25,9 +25,6 @@ make -BUILD=Release && make install That is it now you are off and running. -NOTE: When using the library with WINDOWS you must define _WIN32 and when using with LINUX - you must define _LINUX. - ------------------------------------------------------------------------------------------ * SimpleSocket Class Overview ------------------------------------------------------------------------------------------ diff --git a/examples/RecvAsync.cpp b/examples/RecvAsync.cpp index d4e415f..647c039 100644 --- a/examples/RecvAsync.cpp +++ b/examples/RecvAsync.cpp @@ -1,7 +1,7 @@ #include #include "PassiveSocket.h" -#ifdef WIN32 +#ifdef _WIN32 #include // usually defined with #include diff --git a/src/ActiveSocket.cpp b/src/ActiveSocket.cpp index 3dd5b12..b9054dd 100644 --- a/src/ActiveSocket.cpp +++ b/src/ActiveSocket.cpp @@ -64,7 +64,7 @@ bool CActiveSocket::ConnectTCP(const char *pAddr, uint16 nPort) if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL) { -#ifdef WIN32 +#ifdef _WIN32 TranslateSocketError(); #else if (h_errno == HOST_NOT_FOUND) @@ -144,7 +144,7 @@ bool CActiveSocket::ConnectUDP(const char *pAddr, uint16 nPort) if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL) { -#ifdef WIN32 +#ifdef _WIN32 TranslateSocketError(); #else if (h_errno == HOST_NOT_FOUND) @@ -202,7 +202,7 @@ bool CActiveSocket::ConnectRAW(const char *pAddr, uint16 nPort) if ((m_pHE = GETHOSTBYNAME(pAddr)) == NULL) { -#ifdef WIN32 +#ifdef _WIN32 TranslateSocketError(); #else if (h_errno == HOST_NOT_FOUND) diff --git a/src/Host.h b/src/Host.h index 9eaaba1..d159a50 100644 --- a/src/Host.h +++ b/src/Host.h @@ -61,7 +61,7 @@ extern "C" #define __WORDSIZE 32 #endif -#if defined(_LINUX) || defined(_DARWIN) +#if defined(__unix__) || defined(__APPLE__) typedef unsigned char uint8; typedef char int8; typedef unsigned short uint16; @@ -71,7 +71,7 @@ extern "C" typedef int SOCKET; #endif -#ifdef WIN32 +#ifdef _WIN32 struct iovec { void *iov_base; size_t iov_len; @@ -85,11 +85,11 @@ extern "C" typedef int int32; #endif -#ifdef WIN32 +#ifdef _WIN32 typedef int socklen_t; #endif -#if defined(WIN32) +#if defined(_WIN32) typedef unsigned long long int uint64; typedef long long int int64; #elif (__WORDSIZE == 32) @@ -102,7 +102,7 @@ extern "C" typedef long int int64; #endif -#ifdef WIN32 +#ifdef _WIN32 #ifndef UINT8_MAX #define UINT8_MAX (UCHAR_MAX) @@ -123,7 +123,7 @@ extern "C" #endif #endif -#if defined(WIN32) +#if defined(_WIN32) #define ssize_t size_t #endif @@ -150,7 +150,7 @@ extern "C" /* Socket Macros */ /* */ /*---------------------------------------------------------------------------*/ -#ifdef WIN32 +#ifdef _WIN32 #define SHUT_RD 0 #define SHUT_WR 1 #define SHUT_RDWR 2 @@ -176,7 +176,7 @@ extern "C" #define GETHOSTBYNAME(a) gethostbyname(a) #endif -#if defined(_LINUX) || defined(_DARWIN) +#if defined(__unix__) || defined(__APPLE__) #define ACCEPT(a,b,c) accept(a,b,c) #define CONNECT(a,b,c) connect(a,b,c) #define CLOSE(a) close(a) @@ -226,19 +226,19 @@ extern "C" /* Misc Macros */ /* */ /*---------------------------------------------------------------------------*/ -#if defined(WIN32) +#if defined(_WIN32) #define GET_CLOCK_COUNT(x) QueryPerformanceCounter((LARGE_INTEGER *)x) #else #define GET_CLOCK_COUNT(x) gettimeofday(x, NULL) #endif -#if defined(WIN32) +#if defined(_WIN32) #define STRTOULL(x) _atoi64(x) #else #define STRTOULL(x) strtoull(x, NULL, 10) #endif -#if defined(WIN32) +#if defined(_WIN32) #define SNPRINTF _snprintf #define PRINTF printf #define VPRINTF vprintf diff --git a/src/PassiveSocket.cpp b/src/PassiveSocket.cpp index 2a08570..8d767e6 100644 --- a/src/PassiveSocket.cpp +++ b/src/PassiveSocket.cpp @@ -51,7 +51,7 @@ CPassiveSocket::CPassiveSocket(CSocketType nType) : CSimpleSocket(nType) bool CPassiveSocket::BindMulticast(const char *pInterface, const char *pGroup, uint16 nPort) { bool bRetVal = false; -#ifdef WIN32 +#ifdef _WIN32 ULONG inAddr; #else int32 nReuse; @@ -133,7 +133,7 @@ bool CPassiveSocket::BindMulticast(const char *pInterface, const char *pGroup, u bool CPassiveSocket::Listen(const char *pAddr, uint16 nPort, int32 nConnectionBacklog) { bool bRetVal = false; -#ifdef WIN32 +#ifdef _WIN32 ULONG inAddr; #else int32 nReuse; @@ -147,7 +147,7 @@ bool CPassiveSocket::Listen(const char *pAddr, uint16 nPort, int32 nConnectionBa // descriptor to be reused immediately after the socket is closed instead // of setting in a TIMED_WAIT state. //-------------------------------------------------------------------------- -#ifdef _LINUX +#ifdef __unix__ SETSOCKOPT(m_socket, SOL_SOCKET, SO_REUSEADDR, (char*)&nReuse, sizeof(int32)); SETSOCKOPT(m_socket, IPPROTO_TCP, IP_TOS, &nReuse, sizeof(int32)); #endif diff --git a/src/SimpleSocket.cpp b/src/SimpleSocket.cpp index 7bd1c8a..ef94ed2 100644 --- a/src/SimpleSocket.cpp +++ b/src/SimpleSocket.cpp @@ -92,7 +92,7 @@ CSimpleSocket::CSimpleSocket(CSocketType nType) : //---------------------------------------------------------------------- case CSimpleSocket::SocketTypeRaw: { -#if defined(_LINUX) && !defined(_DARWIN) +#if defined(__unix__) && !defined(__APPLE__) m_nSocketDomain = AF_PACKET; m_nSocketType = CSimpleSocket::SocketTypeRaw; #endif @@ -137,7 +137,7 @@ bool CSimpleSocket::Initialize() { errno = CSimpleSocket::SocketSuccess; -#ifdef WIN32 +#ifdef _WIN32 //------------------------------------------------------------------------- // Data structure containing general Windows Sockets Info //------------------------------------------------------------------------- @@ -833,7 +833,7 @@ bool CSimpleSocket::SetNonblocking(void) { int32 nCurFlags; -#if WIN32 +#if _WIN32 nCurFlags = 1; if (ioctlsocket(m_socket, FIONBIO, (ULONG *)&nCurFlags) != 0) @@ -872,7 +872,7 @@ bool CSimpleSocket::SetBlocking(void) { int32 nCurFlags; -#if WIN32 +#if _WIN32 nCurFlags = 0; if (ioctlsocket(m_socket, FIONBIO, (ULONG *)&nCurFlags) != 0) @@ -949,7 +949,7 @@ int32 CSimpleSocket::SendFile(int32 nOutFd, int32 nInFd, off_t *pOffset, int32 n //------------------------------------------------------------------------------ void CSimpleSocket::TranslateSocketError(void) { -#if defined(_LINUX) || defined(_DARWIN) +#if defined(__unix__) || defined(__APPLE__) switch (errno) { case EXIT_SUCCESS: @@ -1008,7 +1008,7 @@ void CSimpleSocket::TranslateSocketError(void) break; } #endif -#ifdef WIN32 +#ifdef _WIN32 int32 nError = WSAGetLastError(); switch (nError) { diff --git a/src/SimpleSocket.h b/src/SimpleSocket.h index 603f467..18bfa19 100644 --- a/src/SimpleSocket.h +++ b/src/SimpleSocket.h @@ -49,7 +49,7 @@ #include #include -#if defined(_LINUX) || defined (_DARWIN) +#if defined(__unix__) || defined (__APPLE__) #include #include #include @@ -57,16 +57,16 @@ #include #include #endif -#ifdef _LINUX +#ifdef __unix__ #include #include #include #include #endif -#ifdef _DARWIN +#ifdef __APPLE__ #include #endif -#if defined(_LINUX) || defined (_DARWIN) +#if defined(__unix__) || defined (__APPLE__) #include #include #include @@ -570,7 +570,7 @@ class CSimpleSocket { struct sockaddr_in m_stMulticastGroup; /// multicast group to bind to struct linger m_stLinger; /// linger flag CStatTimer m_timer; /// internal statistics. -#ifdef WIN32 +#ifdef _WIN32 WSADATA m_hWSAData; /// Windows #endif fd_set m_writeFds; /// write file descriptor set diff --git a/src/StatTimer.h b/src/StatTimer.h index 2110add..b7f1dc6 100644 --- a/src/StatTimer.h +++ b/src/StatTimer.h @@ -45,19 +45,19 @@ #include -#if WIN32 +#if _WIN32 #include #include #endif -#ifdef _LINUX +#ifdef __unix__ #include #include #endif #include "Host.h" -#if defined(WIN32) +#if defined(_WIN32) #define GET_CLOCK_COUNT(x) QueryPerformanceCounter((LARGE_INTEGER *)x) #else #define GET_CLOCK_COUNT(x) gettimeofday(x, NULL) From 4498e34aa5112f4011bc319b5ab4532c8fc2a324 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 18:21:26 -0800 Subject: [PATCH 5/9] Update README to specify how to run CMake --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index a1fc085..cc9aa03 100644 --- a/README +++ b/README @@ -21,7 +21,7 @@ This is a very small library and is very easy to build and configure. To build make sure you are logged in as a user who has access to the recommend GNU installation directories. Then type -make -BUILD=Release && make install +cmake -DCMAKE_BUILD_TYPE=Release && make && make install That is it now you are off and running. From 1df48f1e57bb1d3f50f5c0a656e181b1d42214f4 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 18:26:26 -0800 Subject: [PATCH 6/9] CMake: set INTERFACE_INCLUDE_DIRECTORIES Makes it easier to use inside of another project by correctly propagating usage requirements. --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index feb94f9..60fabb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,6 @@ set(BUILD_MINOR "4") set(BUILD_VERSION "3") set(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_VERSION}) -include_directories(src) - SET(CLSOCKET_HEADERS src/ActiveSocket.h src/Host.h @@ -45,6 +43,11 @@ endif() # make the lib add_library(clsocket ${CLSOCKET_SOURCES}) TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS}) +# target_include_directories was added in 2.8.11 +set_target_properties(clsocket PROPERTIES + INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src + INTERFACE_INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src +) # install into configured prefix install(TARGETS clsocket DESTINATION lib) From a1039ef07becb1e45fdbbe2ef4a37e1d2f4a4605 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 18:29:19 -0800 Subject: [PATCH 7/9] CMake: don't need to set HEADER_FILE_ONLY It's set automatically based on file extension. --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60fabb8..6ac78a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,6 @@ src/ActiveSocket.cpp src/PassiveSocket.cpp ) -# mark headers as headers... -SET_SOURCE_FILES_PROPERTIES( ${CLSOCKET_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE ) -# append to sources so that dependency checks work on headers -LIST(APPEND CLSOCKET_SOURCES ${CLSOCKET_HEADERS}) - # OS and compiler checks. if(WIN32) add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) @@ -41,7 +36,8 @@ if(DEFINED CLSOCKET_DEP_ONLY) endif() # make the lib -add_library(clsocket ${CLSOCKET_SOURCES}) +# add headers so that they appear in IDEs +add_library(clsocket ${CLSOCKET_SOURCES} ${CLSOCKET_HEADERS}) TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS}) # target_include_directories was added in 2.8.11 set_target_properties(clsocket PROPERTIES From 82f6fda89c4a1b8838483f5b2517465d3c7224ee Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 18:32:33 -0800 Subject: [PATCH 8/9] CMake: clean up use of target_link_libraries --- CMakeLists.txt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ac78a2..7e4c485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,12 +21,6 @@ src/ActiveSocket.cpp src/PassiveSocket.cpp ) -# OS and compiler checks. -if(WIN32) - add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) - SET(PROJECT_LIBS Ws2_32.lib) -endif() - option(BUILD_SHARED_LIBS "Build libs as shared" ON) if(DEFINED CLSOCKET_SHARED) message(FATAL_ERROR "The CLSOCKET_SHARED option is deprecated, instead use BUILD_SHARED_LIBS.") @@ -38,7 +32,10 @@ endif() # make the lib # add headers so that they appear in IDEs add_library(clsocket ${CLSOCKET_SOURCES} ${CLSOCKET_HEADERS}) -TARGET_LINK_LIBRARIES(clsocket ${PROJECT_LIBS}) +if(WIN32) + add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) + target_link_libraries(clsocket PRIVATE Ws2_32) +endif() # target_include_directories was added in 2.8.11 set_target_properties(clsocket PROPERTIES INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src @@ -57,14 +54,14 @@ if(UNIX) if(CLSOCKET_EXAMPLES) ADD_EXECUTABLE(clsocket-example examples/RecvAsync.cpp) - TARGET_LINK_LIBRARIES(clsocket-example clsocket pthread) + target_link_libraries(clsocket-example clsocket pthread) install(TARGETS clsocket-example DESTINATION bin) ADD_EXECUTABLE(querydaytime-example examples/QueryDayTime.cpp) - TARGET_LINK_LIBRARIES(querydaytime-example clsocket) + target_link_libraries(querydaytime-example clsocket) ADD_EXECUTABLE(echoserver-example examples/EchoServer.cpp) - TARGET_LINK_LIBRARIES(echoserver-example clsocket) + target_link_libraries(echoserver-example clsocket) endif() endif() From 9f64da7a84cb7bcec8b34dabe3fd095493637e37 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Thu, 9 Feb 2017 18:38:06 -0800 Subject: [PATCH 9/9] CMake: use lowercase command names It was inconsistent, standardize on the KitWare preferred style. --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e4c485..429ba62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(BUILD_MINOR "4") set(BUILD_VERSION "3") set(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_VERSION}) -SET(CLSOCKET_HEADERS +set(CLSOCKET_HEADERS src/ActiveSocket.h src/Host.h src/PassiveSocket.h @@ -15,7 +15,7 @@ src/SimpleSocket.h src/StatTimer.h ) -SET(CLSOCKET_SOURCES +set(CLSOCKET_SOURCES src/SimpleSocket.cpp src/ActiveSocket.cpp src/PassiveSocket.cpp @@ -50,17 +50,17 @@ set_target_properties(clsocket PROPERTIES VERSION ${BUILD_VERSION} SOVERSION ${BUILD_MAJOR}) if(UNIX) - OPTION(CLSOCKET_EXAMPLES "Build the examples" OFF) + option(CLSOCKET_EXAMPLES "Build the examples" OFF) if(CLSOCKET_EXAMPLES) - ADD_EXECUTABLE(clsocket-example examples/RecvAsync.cpp) + add_executable(clsocket-example examples/RecvAsync.cpp) target_link_libraries(clsocket-example clsocket pthread) install(TARGETS clsocket-example DESTINATION bin) - ADD_EXECUTABLE(querydaytime-example examples/QueryDayTime.cpp) + add_executable(querydaytime-example examples/QueryDayTime.cpp) target_link_libraries(querydaytime-example clsocket) - ADD_EXECUTABLE(echoserver-example examples/EchoServer.cpp) + add_executable(echoserver-example examples/EchoServer.cpp) target_link_libraries(echoserver-example clsocket) endif() endif()