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
5d4c2641
Unverified
Commit
5d4c2641
authored
May 19, 2021
by
Maarten L. Hekkelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cmake file, now creates unit-test
parent
bc320715
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
8 deletions
+22
-8
CMakeLists.txt
+22
-6
GNUmakefile.in
+0
-2
rsrc/curves.xml
+0
-0
No files found.
CMakeLists.txt
View file @
5d4c2641
...
...
@@ -47,7 +47,7 @@ set (Boost_DETAILED_FAILURE_MSG ON)
# set (Boost_COMPILER "-vc")
# set (Boost_USE_STATIC_RUNTIME ON)
find_package
(
Boost 1.73.0 REQUIRED COMPONENTS system iostreams
)
find_package
(
Boost 1.73.0 REQUIRED COMPONENTS system iostreams
regex date_time
)
set
(
CMAKE_THREAD_PREFER_PTHREAD
)
set
(
THREADS_PREFER_PTHREAD_FLAG
)
...
...
@@ -93,9 +93,10 @@ set(project_headers
include_directories
(
${
PROJECT_SOURCE_DIR
}
/include
${
PROJECT_SOURCE_DIR
}
/src
)
)
add_library
(
${
PROJECT_NAME
}
${
project_sources
}
${
project_headers
}
)
add_executable
(
unit-test
${
PROJECT_SOURCE_DIR
}
/test/unit-test.cpp
)
configure_file
(
libcifpp.pc.in
${
CMAKE_BINARY_DIR
}
/libcifpp.pc IMMEDIATE @ONLY
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/libcifpp.pc DESTINATION
${
LIB_INSTALL_DIR
}
/pkgconfig
)
...
...
@@ -105,20 +106,35 @@ target_include_directories(${PROJECT_NAME} PUBLIC "${PROJECT_BINARY_DIR}")
# install(FILES ${CMAKE_BINARY_DIR}/Config.hpp DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME})
if
(
Boost_FOUND
)
target_
include_directories
(
${
PROJECT_NAME
}
PUBLIC
${
Boost_INCLUDE_DIRS
}
)
target_
link_libraries
(
${
PROJECT_NAME
}
${
Boost_LIBRARIES
}
)
include_directories
(
${
PROJECT_NAME
}
PUBLIC
${
Boost_INCLUDE_DIRS
}
)
link_libraries
(
${
PROJECT_NAME
}
${
Boost_LIBRARIES
}
)
endif
()
install
(
DIRECTORY include/cif++ DESTINATION
${
INCLUDE_INSTALL_DIR
}
)
install
(
FILES
${
PROJECT_SOURCE_DIR
}
/rsrc/mmcif_ddl.dic
${
PROJECT_SOURCE_DIR
}
/rsrc/mmcif_pdbx_v50.dic
DESTINATION
${
SHARE_INSTALL_DIR
}
/libcifpp/
)
install
(
TARGETS
${
PROJECT_NAME
}
LIBRARY DESTINATION
${
LIB_INSTALL_DIR
}
ARCHIVE DESTINATION
${
LIB_INSTALL_DIR
}
RUNTIME DESTINATION
${
BIN_INSTALL_DIR
}
)
target_compile_definitions
(
${
PROJECT_NAME
}
PUBLIC
""
CACHE_DIR=
"
${
SHARE_INSTALL_DIR
}
/libcifpp"
DATA_DIR=
"
${
SHARE_INSTALL_DIR
}
/libcifpp"
)
target_compile_definitions
(
unit-test
PUBLIC
""
CACHE_DIR=
"
${
SHARE_INSTALL_DIR
}
/libcifpp"
DATA_DIR=
"
${
SHARE_INSTALL_DIR
}
/libcifpp"
)
target_link_libraries
(
unit-test
${
PROJECT_NAME
}
${
Boost_LIBRARIES
}
)
if
(
MSVC
)
# Disable a MSVC warning type.
target_compile_options
(
cifpp PRIVATE /permissive-
)
# make msvc standards compliant...
target_compile_options
(
${
PROJECT_NAME
}
PRIVATE /permissive-
)
target_compile_options
(
unit-test PRIVATE /permissive-
)
endif
()
GNUmakefile.in
View file @
5d4c2641
...
...
@@ -282,8 +282,6 @@ install: install-lib
install
-d
$(libdir)
$(LIBTOOL)
--mode
=
install install
$(LIB_TARGET)
$(libdir)
install
-d
$(datadir)
/libcifpp
install
-m644
rsrc/isomers.txt
$(datadir)
/libcifpp
;
gzip
-f
$(datadir)
/libcifpp/isomers.txt
for
d
in
mmcif_ddl.dic mmcif_pdbx_v50.dic
;
do
\
install
-m644
rsrc/
$$
d
$(datadir)
/libcifpp
;
\
gzip
-f
$(datadir)
/libcifpp/
$$
d
;
\
...
...
rsrc/curves.xml
deleted
100644 → 0
View file @
bc320715
This diff is collapsed.
Click to expand it.
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