Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
libcifpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
libcifpp
Commits
4ac90128
Unverified
Commit
4ac90128
authored
Sep 28, 2021
by
Maarten L. Hekkelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zlib in boost
parent
5e35ea51
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
CMakeLists.txt
+5
-9
No files found.
CMakeLists.txt
View file @
4ac90128
...
@@ -178,9 +178,7 @@ find_package(Threads)
...
@@ -178,9 +178,7 @@ find_package(Threads)
set
(
Boost_DETAILED_FAILURE_MSG ON
)
set
(
Boost_DETAILED_FAILURE_MSG ON
)
# set(Boost_USE_STATIC_LIBS ON)
# set(Boost_USE_STATIC_LIBS ON)
find_package
(
Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options
)
find_package
(
Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options OPTIONAL_COMPONENTS zlib
)
find_package
(
ZLIB REQUIRED COMPONENTS zlibstatic
)
# Create a revision file, containing the current git version info
# Create a revision file, containing the current git version info
...
@@ -207,7 +205,7 @@ if(RECREATE_SYMOP_DATA)
...
@@ -207,7 +205,7 @@ if(RECREATE_SYMOP_DATA)
add_executable
(
symop-map-generator
"
${
CMAKE_SOURCE_DIR
}
/tools/symop-map-generator.cpp"
)
add_executable
(
symop-map-generator
"
${
CMAKE_SOURCE_DIR
}
/tools/symop-map-generator.cpp"
)
target_link_libraries
(
symop-map-generator Threads::Threads
${
Boost_LIBRARIES
}
std::filesystem
ZLIB::ZLIB
)
target_link_libraries
(
symop-map-generator Threads::Threads
${
Boost_LIBRARIES
}
std::filesystem
)
if
(
Boost_INCLUDE_DIR
)
if
(
Boost_INCLUDE_DIR
)
target_include_directories
(
symop-map-generator PUBLIC
${
Boost_INCLUDE_DIR
}
)
target_include_directories
(
symop-map-generator PUBLIC
${
Boost_INCLUDE_DIR
}
)
endif
()
endif
()
...
@@ -271,16 +269,14 @@ target_include_directories(cifpp
...
@@ -271,16 +269,14 @@ target_include_directories(cifpp
PUBLIC
PUBLIC
"$<BUILD_INTERFACE:
${
PROJECT_SOURCE_DIR
}
/include>"
"$<BUILD_INTERFACE:
${
PROJECT_SOURCE_DIR
}
/include>"
"$<INSTALL_INTERFACE:
${
CMAKE_INSTALL_INCLUDEDIR
}
>"
"$<INSTALL_INTERFACE:
${
CMAKE_INSTALL_INCLUDEDIR
}
>"
${
Boost_INCLUDE_DIR
}
${
Boost_INCLUDE_DIR
}
)
${
ZLIB_INCLUDE_DIR
}
)
target_include_directories
(
cifpp
target_include_directories
(
cifpp
PRIVATE
PRIVATE
${
CMAKE_BINARY_DIR
}
${
CMAKE_BINARY_DIR
}
)
)
target_link_libraries
(
cifpp Threads::Threads
${
Boost_LIBRARIES
}
std::filesystem
ZLIB::ZLIB
)
target_link_libraries
(
cifpp Threads::Threads
${
Boost_LIBRARIES
}
std::filesystem
)
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"AppleClang"
)
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"AppleClang"
)
target_link_options
(
cifpp PRIVATE -undefined dynamic_lookup
)
target_link_options
(
cifpp PRIVATE -undefined dynamic_lookup
)
...
@@ -454,7 +450,7 @@ if(CIFPP_BUILD_TESTS)
...
@@ -454,7 +450,7 @@ if(CIFPP_BUILD_TESTS)
${
CMAKE_CURRENT_BINARY_DIR
}
# for config.h
${
CMAKE_CURRENT_BINARY_DIR
}
# for config.h
)
)
target_link_libraries
(
${
CIFPP_TEST
}
PRIVATE Threads::Threads cifpp
${
Boost_LIBRARIES
}
std::filesystem
ZLIB::ZLIB
)
target_link_libraries
(
${
CIFPP_TEST
}
PRIVATE Threads::Threads cifpp
${
Boost_LIBRARIES
}
std::filesystem
)
if
(
MSVC
)
if
(
MSVC
)
# Specify unwind semantics so that MSVC knowns how to handle exceptions
# Specify unwind semantics so that MSVC knowns how to handle exceptions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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