Skip to main content
Homepage
Explore
Search or go to…
/
Sign in
Explore
Primary navigation
Project
L
libwebsockets
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
Fork
libwebsockets
Commits
15a38a78
This project is archived. Its data is
read-only
.
Commit
15a38a78
authored
Mar 9, 2013
by
Edwin van den Oetelaar
Committed by
Andy Green
Mar 9, 2013
Browse files
Options
Downloads
Patches
Plain Diff
cmake some cosmetic improvementss
Signed-off-by:
Edwin van den Oetelaar
<
oetelaar.automatisering@gmail.com
>
parent
2fd02fc0
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+19
-19
19 additions, 19 deletions
CMakeLists.txt
with
19 additions
and
19 deletions
CMakeLists.txt
+
19
−
19
View file @
15a38a78
...
@@ -214,7 +214,7 @@ configure_file(
...
@@ -214,7 +214,7 @@ configure_file(
if
(
MSVC
)
if
(
MSVC
)
# Turn off stupid microsoft security warnings.
# Turn off stupid microsoft security warnings.
add_definitions
(
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
)
add_definitions
(
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
)
endif
()
endif
(
MSVC
)
include_directories
(
${
PROJECT_SOURCE_DIR
}
/lib
)
include_directories
(
${
PROJECT_SOURCE_DIR
}
/lib
)
...
@@ -278,28 +278,28 @@ if (MINGW)
...
@@ -278,28 +278,28 @@ if (MINGW)
list
(
APPEND SOURCES
list
(
APPEND SOURCES
${
WIN32_HELPERS_PATH
}
/gettimeofday.c
${
WIN32_HELPERS_PATH
}
/gettimeofday.c
)
)
else
()
else
(
MINGW
)
list
(
APPEND SOURCES
list
(
APPEND SOURCES
${
WIN32_HELPERS_PATH
}
/websock-w32.c
${
WIN32_HELPERS_PATH
}
/websock-w32.c
${
WIN32_HELPERS_PATH
}
/gettimeofday.c
${
WIN32_HELPERS_PATH
}
/gettimeofday.c
)
)
endif
()
endif
(
MINGW
)
include_directories
(
${
WIN32_HELPERS_PATH
}
)
include_directories
(
${
WIN32_HELPERS_PATH
}
)
else
()
else
(
WIN32
)
# Unix.
# Unix.
if
(
NOT WITHOUT_DAEMONIZE
)
if
(
NOT WITHOUT_DAEMONIZE
)
list
(
APPEND SOURCES
list
(
APPEND SOURCES
lib/daemonize.c
lib/daemonize.c
)
)
endif
()
endif
()
endif
()
endif
(
WIN32
)
if
(
UNIX
)
if
(
UNIX
)
if
(
NOT HAVE_GETIFADDRS
)
if
(
NOT HAVE_GETIFADDRS
)
list
(
APPEND HDR_PRIVATE lib/getifaddrs.h
)
list
(
APPEND HDR_PRIVATE lib/getifaddrs.h
)
list
(
APPEND SOURCES lib/getifaddrs.c
)
list
(
APPEND SOURCES lib/getifaddrs.c
)
endif
()
endif
()
endif
()
endif
(
UNIX
)
source_group
(
"Headers Private"
FILES
${
HDR_PRIVATE
}
)
source_group
(
"Headers Private"
FILES
${
HDR_PRIVATE
}
)
source_group
(
"Headers Public"
FILES
${
HDR_PUBLIC
}
)
source_group
(
"Headers Public"
FILES
${
HDR_PUBLIC
}
)
...
@@ -332,7 +332,7 @@ if (WIN32)
...
@@ -332,7 +332,7 @@ if (WIN32)
LWS_DLL
LWS_DLL
LWS_INTERNAL
LWS_INTERNAL
)
)
endif
()
endif
(
WIN32
)
# We want the shared lib to be named "libwebsockets"
# We want the shared lib to be named "libwebsockets"
# not "libwebsocket_shared".
# not "libwebsocket_shared".
...
@@ -487,10 +487,10 @@ if (NOT WITHOUT_TESTAPPS)
...
@@ -487,10 +487,10 @@ if (NOT WITHOUT_TESTAPPS)
if
(
LINK_TESTAPPS_DYNAMIC
)
if
(
LINK_TESTAPPS_DYNAMIC
)
target_link_libraries
(
${
TEST_NAME
}
websockets_shared
)
target_link_libraries
(
${
TEST_NAME
}
websockets_shared
)
add_dependencies
(
${
TEST_NAME
}
websockets_shared
)
add_dependencies
(
${
TEST_NAME
}
websockets_shared
)
else
()
else
(
LINK_TESTAPPS_DYNAMIC
)
target_link_libraries
(
${
TEST_NAME
}
websockets
)
target_link_libraries
(
${
TEST_NAME
}
websockets
)
add_dependencies
(
${
TEST_NAME
}
websockets
)
add_dependencies
(
${
TEST_NAME
}
websockets
)
endif
()
endif
(
LINK_TESTAPPS_DYNAMIC
)
# Set test app specific defines.
# Set test app specific defines.
set_property
(
TARGET
${
TEST_NAME
}
set_property
(
TARGET
${
TEST_NAME
}
...
@@ -543,7 +543,7 @@ if (NOT WITHOUT_TESTAPPS)
...
@@ -543,7 +543,7 @@ if (NOT WITHOUT_TESTAPPS)
# We need to link against winsock code.
# We need to link against winsock code.
if
(
WIN32
)
if
(
WIN32
)
target_link_libraries
(
test-server-extpoll ws2_32.lib
)
target_link_libraries
(
test-server-extpoll ws2_32.lib
)
endif
()
endif
(
WIN32
)
endif
()
endif
()
# Data files for running the test server.
# Data files for running the test server.
...
@@ -696,7 +696,7 @@ Cflags: -I\${includedir}"
...
@@ -696,7 +696,7 @@ Cflags: -I\${includedir}"
install
(
FILES
${
PROJECT_BINARY_DIR
}
/libwebsockets.pc
install
(
FILES
${
PROJECT_BINARY_DIR
}
/libwebsockets.pc
DESTINATION include/pkgconfig
)
DESTINATION include/pkgconfig
)
endif
()
endif
(
UNIX
)
# Install headers.
# Install headers.
install
(
FILES
${
HDR_PUBLIC
}
install
(
FILES
${
HDR_PUBLIC
}
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
sign in
to comment