diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..c1864374 --- /dev/null +++ b/CMakeLists.txt @@ -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) + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..0d88bc99 --- /dev/null +++ b/src/CMakeLists.txt @@ -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}) +set(DFLT_DATADIR ${nonxsdir}) diff --git a/src/DataLib/CMakeLists.txt b/src/DataLib/CMakeLists.txt new file mode 100644 index 00000000..481b8dd8 --- /dev/null +++ b/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") +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}) diff --git a/src/config.h.in b/src/config.h.in new file mode 100644 index 00000000..6377e7d4 --- /dev/null +++ b/src/config.h.in @@ -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)" diff --git a/src/input.C b/src/input.C index 7429f854..3c34cd15 100644 --- a/src/input.C +++ b/src/input.C @@ -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 #include