Skip to content

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.

Sign up for GitHub

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
base: main
Choose a base branch
from
+48 −1
Open

Switch to CMake #35

Show file tree
Hide file tree
Changes from 4 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
Jun 3, 2020
074f0df
Small fix
Jun 3, 2020
7be76b6
Removed empty cmake files
Jun 12, 2020
6648d1d
Changed variable name for source files
Jun 12, 2020
7660b48
Deleted version.h and changed verison.h.in -> config.h.in
Jun 29, 2020
c5e9300
deleted version.h.in
Jun 29, 2020
4a8a995
Requested changes to src CMake file
Jun 29, 2020
2c9b078
Final changes to src direcotry cmake files
Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# src directory CMake file

include_directories(${CMAKE_CURRENT_SOURCE_DIR})
configure_file(version.h.in "${CMAKE_CURRENT_SOURCE_DIR}/config.h")
configure_file(config.h.in "${CMAKE_CURRENT_SOURCE_DIR}/config.h")

FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
FILE(GLOB c_files "${CMAKE_CURRENT_SOURCE_DIR}/*.C")
SET(SOURCE_FILES ${c_files})

Expand All @@ -12,4 +11,7 @@ add_subdirectory(DataLib)

# Add all source files
add_executable(alara ${SOURCE_FILES})
target_link_libraries(alara DataLib)

# Set direcotry variable names
Copy link
Member

@gonuke gonuke Jun 30, 2020

Choose a reason for hiding this comment

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

typo

Suggested change
# Set direcotry variable names
# Set directory variable names

set(DFLT_XSDIR ${xsdir})
Copy link
Member

@gonuke gonuke Jun 30, 2020

Choose a reason for hiding this comment

The 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})
1 change: 0 additions & 1 deletion src/DataLib/alara.h
View file
Open in desktop

This file was deleted.

0 src/version.h.in → src/config.h.in
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/input.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* $Id: input.C,v 1.14 2007-12-20 22:03:56 wilsonp Exp $ */
#include "alara.h"
#include "input_tokens.h"
//#include "dflt_datadir.h"
#include <sys/types.h>
#include <sys/stat.h>

Expand Down
2 changes: 0 additions & 2 deletions src/version.h
View file
Open in desktop

This file was deleted.