-
Notifications
You must be signed in to change notification settings - Fork 24
Switch to CMake #35
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
Open
bradlaufenberg
wants to merge
8
commits into
svalinn:main
Choose a base branch
from
bradlaufenberg:switch_to_cmake
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Switch to CMake #35
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c809bee
A first attempt at implementing CMake into alara
074f0df
Small fix
7be76b6
Removed empty cmake files
6648d1d
Changed variable name for source files
7660b48
Deleted version.h and changed verison.h.in -> config.h.in
c5e9300
deleted version.h.in
4a8a995
Requested changes to src CMake file
2c9b078
Final changes to src direcotry cmake files
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # Top level CMake file | ||
|
|
||
| # Set the minimum version of CMake required to run properly | ||
| cmake_minimum_required(VERSION 3.0.0) | ||
|
|
||
| # Set the project name | ||
| project(ALARA VERSION 2.7.1) | ||
|
|
||
| # Add all subdirectories | ||
| # add_subdirectory(data) | ||
| # add_subdirectory(developer-info) | ||
| # add_subdirectory(doc) | ||
| # add_subdirectory(sample) | ||
| add_subdirectory(src) | ||
| # add_subdirectory(tools) | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # src directory CMake file | ||
|
|
||
| include_directories(${CMAKE_CURRENT_SOURCE_DIR}) | ||
| configure_file(config.h.in "${CMAKE_CURRENT_SOURCE_DIR}/config.h") | ||
|
|
||
| FILE(GLOB c_files "${CMAKE_CURRENT_SOURCE_DIR}/*.C") | ||
| SET(SOURCE_FILES ${c_files}) | ||
|
|
||
| # Add the Data Library | ||
| add_subdirectory(DataLib) | ||
|
|
||
| # Add all source files | ||
| add_executable(alara ${SOURCE_FILES}) | ||
|
|
||
| # Set direcotry variable names | ||
| set(DFLT_XSDIR ${xsdir}) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this will do what it needs to do - we should discuss (see note in Slack) |
||
| set(DFLT_DATADIR ${nonxsdir}) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # CMake file in the DataLib direcotry within the src directory | ||
|
|
||
| FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h") | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure that you need |
||
| FILE(GLOB c_files "${CMAKE_CURRENT_SOURCE_DIR}/*.C") | ||
| FILE(GLOB cpp_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") | ||
| SET(DATA_LIB_SOURCES ${c_files} ${cpp_files}) | ||
|
|
||
|
|
||
| # Add the library | ||
| add_library(DataLib SHARED ${DATA_LIB_SOURCES}) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #define VERSION "@ALARA_VERSION_MAJOR@.@ALARA_VERSION_MINOR@.@ALARA_VERSION_PATCH@" | ||
| #define PACKAGE_STRING "ALARA " VERSION | ||
| #define DFLT_XSDIR "$(xsdir)" | ||
| #define DFLT_DATADIR "$(nonxsdir)" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo