Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support a modular approach to cinch #65

Merged
merged 11 commits into from
May 8, 2017
Merged

Support a modular approach to cinch #65

merged 11 commits into from
May 8, 2017

Conversation

charest
Copy link
Contributor

@charest charest commented May 7, 2017

Sample usage of new modular approach:

project(myproject)

if(NOT "$ENV{CINCH_SOURCE_DIR}" STREQUAL "")
  set(CINCH_SOURCE_DIR $ENV{CINCH_SOURCE_DIR})
elseif(EXISTS ${CMAKE_SOURCE_DIR}/cinch)
  set(CINCH_SOURCE_DIR ${CMAKE_SOURCE_DIR}/cinch)
endif()

include(${CINCH_SOURCE_DIR}/cmake/modular-cinch-main.cmake)
include(${CINCH_SOURCE_DIR}/cmake/modular-cinch-macros.cmake)

Fix #19.

@charest charest requested review from tuxfan and junghans May 7, 2017 22:41
Copy link
Member

@junghans junghans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to have ProjectLists.txt to include modular-cinch-main.cmake to avoid duplication?

@@ -0,0 +1,270 @@

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name might be a bit too generic and easy to be confused with config/packages.cmake.

@@ -0,0 +1,109 @@
#------------------------------------------------------------------------------#
# Copyright (c) 2014 Los Alamos National Security, LLC
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add 2014-2017 to years.

@charest
Copy link
Contributor Author

charest commented May 8, 2017

@junghans ProjectLists.txt can't really include modular-cinch-main.cmake, but I pulled the duplicated content into a new file called globals.cmake.

Ref. #35, flecsi doesn't need cereal anymore, so re-enable.
@charest charest merged commit 75f173b into master May 8, 2017
@charest charest deleted the reorg branch May 8, 2017 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants