Skip to content
This repository has been archived by the owner on Jan 22, 2019. It is now read-only.

Just gtest. #28

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
51d7cf2
Avoid misleading ReadMe in forks.
Sep 9, 2014
8624e63
URL to main repo.
Sep 10, 2014
8b1880d
Merge pull request #1 from codecurve/rewordReadme01
Sep 10, 2014
a1f09f5
Was using RST for URL instead of MarkDown.
Sep 10, 2014
5737f0e
Highlight that current repo maybe fork
Sep 10, 2014
1850ccb
Roll back to just plain gtest.
Feb 16, 2015
f61347e
Merge pull request #18 from codecurve/rewordReadme01
nickerso Feb 17, 2015
8181fbb
Update heading to match the name of the project
nickerso Feb 17, 2015
606ced1
Add link to the documentation.
nickerso Feb 17, 2015
ffd021c
Adding doxygen config file.
hsorby Feb 21, 2015
03d7145
Doxygen generated config file.
Feb 23, 2015
1ab1782
Adjust Doxygen settings.
hsorby Feb 21, 2015
2abe32e
Doxygen project "brief".
Feb 23, 2015
878c0d3
Include guards
Feb 23, 2015
bd4a32c
Break version implementation intentionally.
Feb 23, 2015
4b69cec
Revert "Break version implementation intentionally."
Feb 23, 2015
a20eace
Use correct case convention for cmake variables.
Feb 23, 2015
b3f7ada
Changed filename case convention.
Feb 23, 2015
dbd46ca
Reinstate namespace dox.
Feb 23, 2015
349d06c
Dox: Enable auto brief.
Feb 23, 2015
9959b10
Fixed: BuildBot filenames had machine specific paths.
Feb 23, 2015
fcc2f26
Moved corresponding #include to top of #includes
Feb 24, 2015
1b452d9
Version patch level number added.
Feb 24, 2015
5d3a255
Refactored cmake files.
Feb 25, 2015
1eb65e3
Elaborated on the version string dox.
Feb 25, 2015
8aa5d86
Move API "public" headers to their own directory.
Feb 25, 2015
81d2883
Isolate includes under api/libcellml directory.
Feb 26, 2015
d1eb624
Tidier doxygen paths.
Feb 26, 2015
e6a794c
Deleted unneeded include path.
Feb 26, 2015
b646b73
Delete "usually".
Feb 26, 2015
8ceb3da
Separated command line cmake flag for tests.
Feb 26, 2015
d9b8319
Indentation whitespace consistency.
Feb 27, 2015
fd07847
Merge remote-tracking branch 'coworker/gtest01' into gtest01
hsorby Feb 27, 2015
af0b435
Revive "test" makefile target.
Feb 27, 2015
01261d4
Changed PROJECT to CMAKE_CURRENT, for source dir.
Mar 1, 2015
d52a929
Removed "if": inclusion is already conditional.
Mar 2, 2015
55c5601
Added dependency on config header.
Mar 2, 2015
a86829f
Renamed so that binary not called libLibcellml*
Mar 2, 2015
33cea29
Changed CMake test for C++11 support.
Mar 3, 2015
2e2b257
Merge remote-tracking branch 'coworker/gtest01' into gtest01
hsorby Mar 3, 2015
ccd7a4f
Finish off some CMake bits and pieces.
hsorby Mar 3, 2015
33a4d4f
Add Apache license 2.0
hsorby Mar 3, 2015
a1124a0
Library for CodeSynthesis XSD v4.0.0.
Mar 3, 2015
9ce9a24
Merge pull request #5 from hsorby/gtest01
Mar 3, 2015
f11f029
Commenting out setting of cxx standard to cxx-11. Can be added back …
hsorby Mar 3, 2015
06f2701
Merge pull request #6 from hsorby/gtest01
Mar 3, 2015
d28fbf1
Set the default of the gtest_force_shared_crt to ON to match the defa…
hsorby Mar 3, 2015
7ea7aab
Having to work around bug 15355 in CMake
hsorby Mar 3, 2015
2803ced
Merge pull request #33 from codecurve/code-synthesis-xsd-lib02
mirams Mar 3, 2015
a945fb3
Merge pull request #7 from hsorby/gtest01
Mar 4, 2015
ead848a
Merge branch 'upstream_master' into gtest01
Mar 4, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ build/
.pydevproject
.settings/

# Qt Creator generated files
CMakeLists.txt.user

65 changes: 65 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Copyright 2015 University of Auckland
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.cmake_minimum_required (VERSION 3.1)

cmake_minimum_required (VERSION 3.1)

set(PROJECT_NAME libCellML)
project(${PROJECT_NAME} CXX)

# Use the following variables when configuring the build from the command line to
# set the corresponding cache variables.
# TESTS ==> LIBCELLML_TESTS
set( LIBCELLML_TESTS OFF CACHE BOOL "Enable build of automated LibCellML tests." )
if( TESTS )
set( LIBCELLML_TESTS "${TESTS}" CACHE BOOL "Enable build of automated LibCellML tests." FORCE )
endif()

# BUILD_TYPE ==> LIBCELLML_BUILD_TYPE
set( LIBCELLML_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." )
if( BUILD_TYPE )
set( LIBCELLML_BUILD_TYPE ${BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE )
endif()

# INSTALL_PREFIX ==> LIBCELLML_INSTALL_PREFIX
set( LIBCELLML_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "Install path prefix, prepended onto install directories." )
if( INSTALL_PREFIX )
set( LIBCELLML_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE STRING "Install path prefix, prepended onto install directories." FORCE )
endif()

# BUILD_SHARED ==> LIBCELLML_BUILD_SHARED
set( LIBCELLML_BUILD_SHARED OFF CACHE BOOL "Build shared libraries (so, dylib, DLLs)." )
if( BUILD_SHARED )
set( LIBCELLML_BUILD_SHARED ${BUILD_SHARED} CACHE BOOL "Build shared libraries (so, dylib, DLLs)." FORCE )
endif()

# internalise some CMake variables
set( CMAKE_INSTALL_PREFIX ${LIBCELLML_INSTALL_PREFIX} CACHE INTERNAL "Internalise CMAKE_INSTALL_PREFIX, manipulate via LIBCELLML_INSTALL_PREFIX" FORCE )
set( CMAKE_BUILD_TYPE ${LIBCELLML_BUILD_TYPE} CACHE INTERNAL "Internalise CMAKE_BUILD_TYPE, manipulate via LIBCELLML_BUILD_TYPE" FORCE )
set( BUILD_SHARED_LIBS ${LIBCELLML_BUILD_SHARED} CACHE INTERNAL "Internalise BUILD_SHARED_LIBS, manipulate via LIBCELLML_BUILD_SHARED" FORCE )
set( CMAKE_CODEBLOCKS_EXECUTABLE "" CACHE INTERNAL "Internalise BUILD_SHARED_LIBS" FORCE )

# The version number.
set(LIBCELLML_VERSION_MAJOR 0)
set(LIBCELLML_VERSION_MINOR 1)
set(LIBCELLML_VERSION_PATCH 0)

# cellml library target
add_subdirectory(${PROJECT_SOURCE_DIR}/src)

if (LIBCELLML_TESTS)
# enable testing here so that we can make use of the 'test' target
enable_testing()
add_subdirectory(${PROJECT_SOURCE_DIR}/tests)
endif()

8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
libcellml
libCellML
=========
libCellML aims to become an easy to use library that will be useful to developers of CellML applications.
It will replace the legacy [CellML-API](http://cellml-api.sourceforge.net/).

This is the primary repository for the development of libCellML
The main libCellML repository is located at: https://github.com/cellml/libcellml, please make sure you are not unintentionally browsing a fork of the main repository.

Please see http://libcellml.readthedocs.org/ for documentation.
Loading