Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
42
Merge Requests
42
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
8df542a8
Commit
8df542a8
authored
Oct 27, 2014
by
Dave Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix formatting issues
parent
6c1c83e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
84 deletions
+75
-84
cmake/ThirdPartyBoost.cmake
cmake/ThirdPartyBoost.cmake
+74
-74
cmake/ThirdPartyTinyxml.cmake
cmake/ThirdPartyTinyxml.cmake
+0
-1
tests/CMakeLists.txt
tests/CMakeLists.txt
+0
-1
tests/Tester.cpp
tests/Tester.cpp
+1
-8
No files found.
cmake/ThirdPartyBoost.cmake
View file @
8df542a8
...
...
@@ -31,17 +31,17 @@ IF (THIRDPARTY_BUILD_BOOST)
IF
(
NOT WIN32
)
EXTERNALPROJECT_ADD
(
boost
PREFIX
${
TPSRC
}
URL
${
TPURL
}
/boost_1_55_0.tar.bz2
URL_MD5
"d6eef4b4cacb2183f2bf265a5a03a354"
STAMP_DIR
${
TPBUILD
}
/stamp
DOWNLOAD_DIR
${
TPSRC
}
SOURCE_DIR
${
TPBUILD
}
/boost
BINARY_DIR
${
TPBUILD
}
/boost
TMP_DIR
${
TPBUILD
}
/boost-tmp
INSTALL_DIR
${
TPDIST
}
CONFIGURE_COMMAND CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
./bootstrap.sh --prefix=
${
TPDIST
}
boost
PREFIX
${
TPSRC
}
URL
${
TPURL
}
/boost_1_55_0.tar.bz2
URL_MD5
"d6eef4b4cacb2183f2bf265a5a03a354"
STAMP_DIR
${
TPBUILD
}
/stamp
DOWNLOAD_DIR
${
TPSRC
}
SOURCE_DIR
${
TPBUILD
}
/boost
BINARY_DIR
${
TPBUILD
}
/boost
TMP_DIR
${
TPBUILD
}
/boost-tmp
INSTALL_DIR
${
TPDIST
}
CONFIGURE_COMMAND CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
./bootstrap.sh --prefix=
${
TPDIST
}
BUILD_COMMAND NO_BZIP2=1 ./b2
variant=release
link=shared
...
...
@@ -66,13 +66,13 @@ IF (THIRDPARTY_BUILD_BOOST)
CONFIGURE_COMMAND call bootstrap.bat
BUILD_COMMAND b2 variant=release
toolset=msvc-12.0
address-model=32
-s NO_BZIP2=1
-s ZLIB_BINARY=zlib
-s ZLIB_INCLUDE=
${
TPDIST
}
/include
-s ZLIB_LIBPATH=
${
TPDIST
}
/lib
${
BOOST_LIB_LIST
}
--layout=system --prefix=
${
TPDIST
}
install
address-model=32
-s NO_BZIP2=1
-s ZLIB_BINARY=zlib
-s ZLIB_INCLUDE=
${
TPDIST
}
/include
-s ZLIB_LIBPATH=
${
TPDIST
}
/lib
${
BOOST_LIB_LIST
}
--layout=system --prefix=
${
TPDIST
}
install
INSTALL_COMMAND
""
)
ENDIF
()
...
...
@@ -90,60 +90,60 @@ IF (THIRDPARTY_BUILD_BOOST)
ENDIF
(
THIRDPARTY_BUILD_ZLIB
)
# Set up CMake variables
IF
(
WIN32
)
SET
(
Boost_DATE_TIME_LIBRARY libboost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_DEBUG libboost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_RELEASE libboost_date_time
)
SET
(
Boost_FILESYSTEM_LIBRARY libboost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_DEBUG libboost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_RELEASE libboost_filesystem
)
SET
(
Boost_IOSTREAMS_LIBRARY libboost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_DEBUG libboost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_RELEASE libboost_iostreams
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY libboost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG libboost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE libboost_program_options
)
SET
(
Boost_REGEX_LIBRARY libboost_regex
)
SET
(
Boost_REGEX_LIBRARY_DEBUG libboost_regex
)
SET
(
Boost_REGEX_LIBRARY_RELEASE libboost_regex
)
SET
(
Boost_SYSTEM_LIBRARY libboost_system
)
SET
(
Boost_SYSTEM_LIBRARY_DEBUG libboost_system
)
SET
(
Boost_SYSTEM_LIBRARY_RELEASE libboost_system
)
SET
(
Boost_THREAD_LIBRARY libboost_thread
)
SET
(
Boost_THREAD_LIBRARY_DEBUG libboost_thread
)
SET
(
Boost_THREAD_LIBRARY_RELEASE libboost_thread
)
SET
(
Boost_INCLUDE_DIRS
${
TPDIST
}
/include
)
SET
(
Boost_LIBRARY_DIRS
${
TPDIST
}
/lib
)
MESSAGE
(
STATUS
${
Boost_DATE_TIME_LIBRARY
}
)
LINK_DIRECTORIES
(
${
Boost_LIBRARY_DIRS
}
)
ELSE
()
SET
(
Boost_DATE_TIME_LIBRARY boost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_DEBUG boost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_RELEASE boost_date_time
)
SET
(
Boost_FILESYSTEM_LIBRARY boost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_DEBUG boost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_RELEASE boost_filesystem
)
SET
(
Boost_IOSTREAMS_LIBRARY boost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_DEBUG boost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_RELEASE boost_iostreams
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG boost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE boost_program_options
)
SET
(
Boost_REGEX_LIBRARY boost_regex
)
SET
(
Boost_REGEX_LIBRARY_DEBUG boost_regex
)
SET
(
Boost_REGEX_LIBRARY_RELEASE boost_regex
)
SET
(
Boost_SYSTEM_LIBRARY boost_system
)
SET
(
Boost_SYSTEM_LIBRARY_DEBUG boost_system
)
SET
(
Boost_SYSTEM_LIBRARY_RELEASE boost_system
)
SET
(
Boost_THREAD_LIBRARY boost_thread
)
SET
(
Boost_THREAD_LIBRARY_DEBUG boost_thread
)
SET
(
Boost_THREAD_LIBRARY_RELEASE boost_thread
)
SET
(
Boost_INCLUDE_DIRS
${
TPSRC
}
/dist/include
${
TPSRC
}
/dist/include/boost-1_49
)
SET
(
Boost_LIBRARY_DIRS
${
TPSRC
}
/dist/lib
)
LINK_DIRECTORIES
(
${
Boost_LIBRARY_DIRS
}
)
ENDIF
()
ELSE
(
THIRDPARTY_BUILD_BOOST
)
IF
(
WIN32
)
SET
(
Boost_DATE_TIME_LIBRARY libboost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_DEBUG libboost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_RELEASE libboost_date_time
)
SET
(
Boost_FILESYSTEM_LIBRARY libboost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_DEBUG libboost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_RELEASE libboost_filesystem
)
SET
(
Boost_IOSTREAMS_LIBRARY libboost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_DEBUG libboost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_RELEASE libboost_iostreams
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY libboost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG libboost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE libboost_program_options
)
SET
(
Boost_REGEX_LIBRARY libboost_regex
)
SET
(
Boost_REGEX_LIBRARY_DEBUG libboost_regex
)
SET
(
Boost_REGEX_LIBRARY_RELEASE libboost_regex
)
SET
(
Boost_SYSTEM_LIBRARY libboost_system
)
SET
(
Boost_SYSTEM_LIBRARY_DEBUG libboost_system
)
SET
(
Boost_SYSTEM_LIBRARY_RELEASE libboost_system
)
SET
(
Boost_THREAD_LIBRARY libboost_thread
)
SET
(
Boost_THREAD_LIBRARY_DEBUG libboost_thread
)
SET
(
Boost_THREAD_LIBRARY_RELEASE libboost_thread
)
SET
(
Boost_INCLUDE_DIRS
${
TPDIST
}
/include
)
SET
(
Boost_LIBRARY_DIRS
${
TPDIST
}
/lib
)
MESSAGE
(
STATUS
${
Boost_DATE_TIME_LIBRARY
}
)
LINK_DIRECTORIES
(
${
Boost_LIBRARY_DIRS
}
)
ELSE
()
SET
(
Boost_DATE_TIME_LIBRARY boost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_DEBUG boost_date_time
)
SET
(
Boost_DATE_TIME_LIBRARY_RELEASE boost_date_time
)
SET
(
Boost_FILESYSTEM_LIBRARY boost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_DEBUG boost_filesystem
)
SET
(
Boost_FILESYSTEM_LIBRARY_RELEASE boost_filesystem
)
SET
(
Boost_IOSTREAMS_LIBRARY boost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_DEBUG boost_iostreams
)
SET
(
Boost_IOSTREAMS_LIBRARY_RELEASE boost_iostreams
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG boost_program_options
)
SET
(
Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE boost_program_options
)
SET
(
Boost_REGEX_LIBRARY boost_regex
)
SET
(
Boost_REGEX_LIBRARY_DEBUG boost_regex
)
SET
(
Boost_REGEX_LIBRARY_RELEASE boost_regex
)
SET
(
Boost_SYSTEM_LIBRARY boost_system
)
SET
(
Boost_SYSTEM_LIBRARY_DEBUG boost_system
)
SET
(
Boost_SYSTEM_LIBRARY_RELEASE boost_system
)
SET
(
Boost_THREAD_LIBRARY boost_thread
)
SET
(
Boost_THREAD_LIBRARY_DEBUG boost_thread
)
SET
(
Boost_THREAD_LIBRARY_RELEASE boost_thread
)
SET
(
Boost_INCLUDE_DIRS
${
TPSRC
}
/dist/include
${
TPSRC
}
/dist/include/boost-1_49
)
SET
(
Boost_LIBRARY_DIRS
${
TPSRC
}
/dist/lib
)
LINK_DIRECTORIES
(
${
Boost_LIBRARY_DIRS
}
)
ENDIF
()
ELSE
(
THIRDPARTY_BUILD_BOOST
)
ADD_CUSTOM_TARGET
(
boost ALL
)
SET
(
Boost_DEBUG 0
)
SET
(
Boost_NO_BOOST_CMAKE ON
)
...
...
@@ -160,8 +160,8 @@ IF (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE
(
Boost QUIET COMPONENTS thread iostreams date_time
filesystem system program_options regex
)
ELSE
()
SET
(
BOOST_ROOT
${
TPDIST
}
)
FIND_PACKAGE
(
Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex
)
SET
(
BOOST_ROOT
${
TPDIST
}
)
FIND_PACKAGE
(
Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex
)
ENDIF
()
ELSE
()
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
...
...
cmake/ThirdPartyTinyxml.cmake
View file @
8df542a8
...
...
@@ -30,7 +30,6 @@ IF (THIRDPARTY_BUILD_TINYXML)
MARK_AS_ADVANCED
(
TINYXML_LIB
)
LINK_DIRECTORIES
(
${
TPDIST
}
/lib
)
INCLUDE_DIRECTORIES
(
${
TPDIST
}
/include
)
ADD_DEFINITIONS
(
"-DTIXML_USE_STL"
)
ELSE
(
THIRDPARTY_BUILD_TINYXML
)
INCLUDE
(
FindTinyXml
)
ENDIF
(
THIRDPARTY_BUILD_TINYXML
)
...
...
tests/CMakeLists.txt
View file @
8df542a8
...
...
@@ -21,7 +21,6 @@ SET(TESTER_HEADERS
)
ADD_DEFINITIONS
(
-DBUILD_PATH=
"
${
CMAKE_BINARY_DIR
}
"
)
ADD_DEFINITIONS
(
-DDIST_PATH=
"
${
CMAKE_INSTALL_PREFIX
}
"
)
IF
(
CMAKE_BUILD_TYPE STREQUAL
"RelWithDebInfo"
)
ADD_DEFINITIONS
(
-DRELWITHDEBINFO
)
...
...
tests/Tester.cpp
View file @
8df542a8
...
...
@@ -191,7 +191,6 @@ int main(int argc, char *argv[])
// Change working directory to the temporary directory
fs
::
current_path
(
tmpDir
);
cout
<<
"Going to directory: "
<<
tmpDir
<<
endl
;
// Copy required files for this test from the test definition directory
// to the temporary directory.
...
...
@@ -219,13 +218,7 @@ int main(int argc, char *argv[])
fs
::
path
execPath
=
startDir
/
fs
::
path
(
file
.
GetExecutable
());
if
(
!
fs
::
exists
(
execPath
))
{
execPath
=
fs
::
path
(
std
::
string
(
DIST_PATH
)
+
std
::
string
(
"/bin/"
+
file
.
GetExecutable
()));
cout
<<
execPath
.
string
()
<<
" "
<<
fs
::
status
(
execPath
).
type
()
<<
endl
;
if
(
!
fs
::
exists
(
execPath
))
{
cout
<<
"wat"
<<
endl
;
execPath
=
fs
::
path
(
file
.
GetExecutable
());
}
execPath
=
fs
::
path
(
file
.
GetExecutable
());
}
command
+=
PortablePath
(
execPath
);
...
...
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