Switch to CMake #35

bradlaufenberg · 2020-06-03T17:56:40Z

So far I have successfully built the src directory using CMake. The next step is to do the same for the rest of the sub directories.

gonuke

Assuming that we'll use a series of different PRs, it's probably best to remove the empty CMakeLists.txt files that have been added here.

We also need to decide how we'll properly set the default data directory and VERSION using CMake.

gonuke · 2020-06-09T22:15:32Z

src/CMakeLists.txt

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


Suggested change

SET(EXECUTABLES ${c_files})

SET(SOURCE_FILES ${c_files})

gonuke · 2020-06-09T22:16:40Z

src/CMakeLists.txt

+add_subdirectory(DataLib)
+
+# Add all source files
+add_executable(alara ${EXECUTABLES})


to match the change above

Suggested change

add_executable(alara ${EXECUTABLES})

add_executable(alara ${SOURCE_FILES})

gonuke · 2020-06-09T22:19:49Z

src/input.C

@@ -1,7 +1,7 @@
 /* $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 "dflt_datadir.h"


Have we successfully figured out how to generate this file with CMake as we were doing with autotools?

I think we have put this info in config.h instead (that is current generated from version.h.in). We can probably delete this line.

gonuke

This is looking pretty good. A few additional comments:

I think we should rename version.h.in to config.h.in since it is used to generate config.h. Be sure to update the line in src/CMakeLists.txt as well
We can delete version.h entirely as we no longer use it
I don't think we need the symbolic link from src/DataLib/alara.h to src/alara.h. If something isn't working we probably need to fix it in CMake
4 .We probably need to add CMake options to set xsdir and nonxsdir so that they can be set properly in config.h

gonuke · 2020-06-12T21:54:50Z

src/CMakeLists.txt

+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+configure_file(version.h.in "${CMAKE_CURRENT_SOURCE_DIR}/config.h")
+
+FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")


You don't use this variable, so probably don't need this line.

gonuke · 2020-06-12T22:04:06Z

src/input.C

@@ -1,7 +1,7 @@
 /* $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 "dflt_datadir.h"


I think we have put this info in config.h instead (that is current generated from version.h.in). We can probably delete this line.

bradlaufenberg · 2020-06-29T17:07:06Z

@gonuke I believe everything is done but before I push just wanted to clarify two things from the latest comments you had made.

Is the symbolic link between src/alara.h and src/DataLib/alara.h the target_link_libraries line in src/CMakeLists.txt ?
Do I set the xsdir and nonxsdir in src/CmakeLists.txt ?

gonuke · 2020-06-29T17:34:15Z

The symbolic link looks like an extra file that appears in the repository. It's actually not directly related to your changes, but I think that your changes make it less necessary.

You should be able to set the value of xsdir and nonxsdir in src/CMakeLists.txt (or equally valid may be CMakeLists.txt) based on the known installation location and relative paths from there.

gonuke

This is getting close but we need to discuss "DFLT_XSDIR" and "DFLT_DATADIR"

gonuke · 2020-06-30T16:44:58Z

src/CMakeLists.txt

@@ -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


typo

Suggested change

# Set direcotry variable names

# Set directory variable names

gonuke · 2020-06-30T16:45:17Z

src/CMakeLists.txt

-target_link_libraries(alara DataLib)
+
+# Set direcotry variable names
+set(DFLT_XSDIR ${xsdir})


I don't think this will do what it needs to do - we should discuss (see note in Slack)

gonuke · 2020-06-30T16:46:08Z

src/DataLib/CMakeLists.txt

@@ -0,0 +1,10 @@
+# CMake file in the DataLib direcotry within the src directory
+
+FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")


Not sure that you need h_files defined.

Brad Laufenberg added 2 commits June 3, 2020 11:50

A first attempt at implementing CMake into alara

c809bee

Small fix

074f0df

gonuke requested changes Jun 9, 2020

View reviewed changes

Brad Laufenberg added 2 commits June 12, 2020 13:17

Removed empty cmake files

7be76b6

Changed variable name for source files

6648d1d

gonuke requested changes Jun 12, 2020

View reviewed changes

gonuke changed the base branch from master to main June 23, 2020 16:16

Brad Laufenberg added 2 commits June 29, 2020 11:47

Deleted version.h and changed verison.h.in -> config.h.in

7660b48

deleted version.h.in

c5e9300

Requested changes to src CMake file

4a8a995

Final changes to src direcotry cmake files

2c9b078

gonuke requested changes Jun 30, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to CMake #35

Switch to CMake #35

bradlaufenberg commented Jun 3, 2020

gonuke left a comment

gonuke Jun 9, 2020

gonuke Jun 9, 2020

gonuke Jun 9, 2020

gonuke Jun 12, 2020

gonuke left a comment

gonuke Jun 12, 2020

gonuke Jun 12, 2020

bradlaufenberg commented Jun 29, 2020

gonuke commented Jun 29, 2020

gonuke left a comment

gonuke Jun 30, 2020

gonuke Jun 30, 2020

gonuke Jun 30, 2020

	add_executable(alara ${EXECUTABLES})
	add_executable(alara ${SOURCE_FILES})

	# Set direcotry variable names
	# Set directory variable names

		@@ -0,0 +1,10 @@
		# CMake file in the DataLib direcotry within the src directory

		FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")

Switch to CMake #35

Are you sure you want to change the base?

Switch to CMake #35

Conversation

bradlaufenberg commented Jun 3, 2020

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bradlaufenberg commented Jun 29, 2020

gonuke commented Jun 29, 2020

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment