Skip to content

Commit ec55941

Browse files
EMventurasmutch
authored andcommitted
Fix Cmake stuff
1 parent f97a604 commit ec55941

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ install(EXPORT MeraxesConfig DESTINATION share/meraxes/cmake)
286286

287287
# Provide the setuprun build command
288288
if(NOT BUILD_SHARED_LIBS)
289-
set(INPUT_FILE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/input/params")
290-
configure_file(${INPUT_FILE_DIR}/input.par ${CMAKE_BINARY_DIR}/input.par ESCAPE_QUOTES @ONLY)
289+
set(INPUT_FILE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/input")
290+
configure_file(${INPUT_FILE_DIR}/params/input.par ${CMAKE_BINARY_DIR}/input.par ESCAPE_QUOTES @ONLY)
291291

292292
add_custom_target(setuprun
293293
COMMENT "Setting up run with minimal required files..."

input/params/input.par

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# found in DefaultsFile and SimParamsFile.**
1818

1919
FileNameGalaxies : meraxes
20-
DefaultsFile : @INPUT_FILE_DIR@/defaults.par
21-
SimParamsFile : @INPUT_FILE_DIR@/simulations/Genesis_L10_N2048_PopIII.par
20+
DefaultsFile : @INPUT_FILE_DIR@/params/defaults.par
21+
SimParamsFile : @INPUT_FILE_DIR@/params/simulations/Genesis_L10_N2048_PopIII.par
2222
OutputSnapshots : -1
2323
OutputDir : output
2424
PhotometricTablesDir : @INPUT_FILE_DIR@/photometric_tables

0 commit comments

Comments
 (0)