Skip to content
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

Mac build #73

Merged
merged 59 commits into from
Apr 5, 2021
Merged

Mac build #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
3bed333
add struct when building standalone
bam241 Jan 4, 2021
bb7234a
changing syntax
bam241 Jan 4, 2021
876a750
testting another implementation
bam241 Jan 4, 2021
1611bd2
adding print stateement
bam241 Jan 4, 2021
bc2f4a8
update syntax
bam241 Jan 4, 2021
29084da
SSTRINGIZE ?
bam241 Jan 4, 2021
bd9e9f3
better ?
bam241 Jan 4, 2021
5deba63
pragmamessage
bam241 Jan 4, 2021
f33d5c1
new test ?
bam241 Jan 4, 2021
0839010
how about it ?
bam241 Jan 4, 2021
7dd4123
better ?
bam241 Jan 4, 2021
0034ec4
back to a working version
bam241 Jan 4, 2021
29e03df
commenting out my addition
bam241 Jan 4, 2021
420d268
back to working implementation
bam241 Jan 4, 2021
781f442
ifdef
bam241 Jan 4, 2021
d801f2d
how about now ?
bam241 Jan 4, 2021
ae27c28
how about now ?
bam241 Jan 4, 2021
1fe2038
readding version.hpp
bam241 Jan 5, 2021
81b288f
update
bam241 Jan 5, 2021
f8d0458
manual fix
bam241 Jan 5, 2021
3832f7b
tweak parth in cmake
bam241 Jan 5, 2021
308674f
better ?
bam241 Jan 5, 2021
653e129
updating version.hpp
bam241 Jan 5, 2021
56a8538
update path
bam241 Jan 5, 2021
414a188
any better ?
bam241 Jan 5, 2021
7a3bd99
updating cmakefile
bam241 Jan 5, 2021
3f979b0
this should work better
bam241 Jan 5, 2021
10267c2
addin missing @
bam241 Jan 5, 2021
8e1565b
b etter ?
bam241 Jan 5, 2021
8b33d2e
better ?
bam241 Jan 5, 2021
bc47f17
this should print as well
bam241 Jan 5, 2021
7f60169
no standalone ?
bam241 Jan 5, 2021
cd56518
better ?
bam241 Jan 5, 2021
68789d8
udpating scope
bam241 Jan 5, 2021
bbd7a9d
back to normal scopt
bam241 Jan 5, 2021
8654603
better ?
bam241 Jan 5, 2021
ac3d80c
better ?
bam241 Jan 6, 2021
e26f090
missing name
bam241 Jan 6, 2021
a5564e6
update cmake
bam241 Jan 6, 2021
a7eb026
fixing names
bam241 Jan 6, 2021
c58af53
that should be it
bam241 Jan 6, 2021
8a613db
using off now
bam241 Jan 6, 2021
81c4884
switch ?
bam241 Jan 6, 2021
4a19216
new test version
bam241 Jan 6, 2021
61e0de7
change valu
bam241 Jan 6, 2021
389eacf
OFF value
bam241 Jan 6, 2021
ea3567e
better ?
bam241 Jan 6, 2021
3b4700c
update
bam241 Jan 6, 2021
467746b
testing the flip
bam241 Jan 6, 2021
9a96464
back to the correct value
bam241 Jan 6, 2021
38462c9
cleaning
bam241 Jan 6, 2021
d055c0b
readding missing
bam241 Jan 6, 2021
c71606f
Merge branch 'mac_build' of github.com:bam241/mcnp2cad into mac_build
bam241 Jan 11, 2021
8edf7a7
removing old file
bam241 Jan 11, 2021
611d068
update variable
bam241 Jan 11, 2021
d2d05db
update variable
bam241 Jan 11, 2021
b670814
no ABI
bam241 Jan 11, 2021
9cb1fdf
cleaning up
bam241 Feb 20, 2021
b12e199
not quote in Version.in
bam241 Mar 30, 2021
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
20 changes: 9 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ project(libMCNP2CAD)

cmake_minimum_required(VERSION 3.0)

set(MCNP2CAD_VERSION_MAJOR 1)
set(MCNP2CAD_VERSION_MINOR 0)
set(MCNP2CAD_VERSION_PATCH 5)

# Build options
option(STANDALONE_MCNP2CAD "Build mcnp2cad as a standalone program" ON)
option(BUILD_MCNP2CAD_TESTS "Build mcnp2cad tests" ON)
Expand All @@ -18,15 +22,6 @@ set(CMAKE_CXX_STANDARD 11)
# iGeom assumed to have cone functionality
add_definitions(-DHAVE_IGEOM_CONE=ON)

# Adjust compiler setting for Linux using gcc version 5.0 and higher
if (CMAKE_SYSTEM_NAME MATCHES Linux AND CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.0")
if (NOT CMAKE_CXX_FLAGS MATCHES _GLIBCXX_USE_CXX11_ABI)
set(CMAKE_CXX_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 ${CMAKE_CXX_FLAGS}")
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps I am out of the loop, but how come these lines were removed? I remember them being necessary when I was building on Linux.

Copy link
Member Author

Choose a reason for hiding this comment

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

it is still needed for Trelis 17.1.
And we now add it manually on the reps we build (MOAB, and DAGMC).

but as this need to be removed for Cubit 2020.2, we decided that we remove them and one specify them manually in the make process.
(@pshriwise I think we need to update the doc)

endif ()
endif ()
endif ()

# Find Eigen3
find_package(Eigen3 3.3 REQUIRED)
message(STATUS "EIGEN3_INCLUDE_DIR: ${EIGEN3_INCLUDE_DIR}")
Expand Down Expand Up @@ -77,6 +72,7 @@ if (STANDALONE_MCNP2CAD)
set(INSTALL_RPATH_DIRS "${CMAKE_INSTALL_PREFIX}/lib")
endif ()
endif ()
configure_file(version.hpp.in version.hpp)

SET(MCNP2CAD_SRC_FILES geometry.cpp
GQ_Characterize.cpp
Expand All @@ -90,8 +86,10 @@ set(MCNP2CAD_PUB_HEADERS dataref.hpp
mcnp2cad.hpp
MCNPInput.hpp
options.hpp
version.hpp
Copy link
Member

Choose a reason for hiding this comment

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

don't we still want this to be installed even though it is autogenerated?

Copy link
Member Author

Choose a reason for hiding this comment

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

we do at line 91

Copy link
Member Author

Choose a reason for hiding this comment

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

I think ?!

Copy link
Member

Choose a reason for hiding this comment

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

I think line 91 makes it available for the build, but doesn't install it for use by downstream applications, although I'm not 100% sure.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes you are probably right...

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll commit an update soon.

volumes.hpp)
volumes.hpp
${CMAKE_CURRENT_BINARY_DIR}/version.hpp)

include_directories(${CMAKE_CURRENT_BINARY_DIR})

# mcnp2cad library
add_library(mcnp2cad SHARED ${MCNP2CAD_SRC_FILES})
Expand Down
5 changes: 5 additions & 0 deletions mcnp2cad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
#include "volumes.hpp"
#include "version.hpp"

#define DEF_OFF_VAL 'OFF'
#if STANDALONE_MCNP2CAD == DEF_OFF_VAL
struct program_option_struct Gopt;
#endif

//Writes the output to mcnp_import.log.
std::ofstream record;

Expand Down
8 changes: 0 additions & 8 deletions version.hpp
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions version.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef MCNP2CAD_VERSION_H
#define MCNP2CAD_VERSION_H

#define MCNP2CAD_VERSION_MAJOR @MCNP2CAD_VERSION_MAJOR@
#define MCNP2CAD_VERSION_MINOR @MCNP2CAD_VERSION_MINOR@
#define MCNP2CAD_VERSION_REV @MCNP2CAD_VERSION_PATCH@

#define STANDALONE_MCNP2CAD @STANDALONE_MCNP2CAD@

#endif /* MCNP2CAD_VERSION_H */