Skip to content

Remove exec flag #11

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
sgenie68 wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Remove exec flag #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
11fc6b0
Set Fieldml to work like all the other dependencies of Iron.
hsorby Apr 22, 2015
f3bc791
corrected the export names so that "FIELDML-API" can be found (was FI…
May 28, 2015
3494426
rewritten large parts of the cmakelists in new cmake way
Jun 11, 2015
6bc7395
rewrote cmakefiles so that the fortran bindings are generated and ins…
Jun 11, 2015
0250a65
now exporting include directories (only on interface target - need to…
Jun 11, 2015
2ade296
forgot to include include-directories for the build interface
Jun 11, 2015
c21ce2d
Correct the indentation and make the print statements Python 3 compat…
hsorby Jun 14, 2015
bab16bc
Find a compromise between Python 2 and Python 3 regarding the print s…
hsorby Jun 15, 2015
6f22b46
fixed naming of backup _IMPORT_PREFIX
Jun 24, 2015
0240a0d
Merge branch 'v0.5.0' of github.com:OpenCMISS-Dependencies/fieldml-ap…
Jun 24, 2015
d9c4044
added eclipse project file
Aug 27, 2015
e51dbe4
lower case changes
Sep 4, 2015
221e1e7
removed library build type explicit declaration (was empty anyways)
rondiplomatico Sep 9, 2015
18c8df5
Merge branch 'devel' into v0.5.0
Sep 16, 2015
c72c6c3
fix for environments without fortran
rondiplomatico Jan 21, 2016
ce89426
updated install location of fortran modules
rondiplomatico Jan 29, 2016
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
Prev Previous commit
Next Next commit
removed library build type explicit declaration (was empty anyways) 
added correct link lib deps
  • Loading branch information
@rondiplomatico
rondiplomatico committed Sep 9, 2015
commit 221e1e7a94758c4317ca964a3275a94448be756a
2 changes: 1 addition & 1 deletion core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SET( FIELDML_API_PUBLIC_HDRS
src/fieldml_api.h )

# Create library
add_library(fieldml-core ${LIBRARY_BUILD_TYPE} ${FIELDML_API_SRCS} ${FIELDML_API_PUBLIC_HDRS}
add_library(fieldml-core ${FIELDML_API_SRCS} ${FIELDML_API_PUBLIC_HDRS}
${FIELDML_API_PRIVATE_HDRS} ${LIBRARY_WIN32_XTRAS})
target_link_libraries(fieldml-core xml2)
target_compile_definitions(fieldml-core PRIVATE $<$<CONFIG:Debug>:DEBUG>)
Expand Down
5 changes: 3 additions & 2 deletions io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ SET( FIELDML_API_PUBLIC_HDRS
#INCLUDE_DIRECTORIES( ${FIELDML_API_PUBLIC_HDRS} ${HDF5_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} )

# Create library
add_library(fieldml-io ${LIBRARY_BUILD_TYPE} ${FIELDML_IO_API_SRCS} ${FIELDML_IO_API_PUBLIC_HDRS} ${FIELDML_IO_API_PRIVATE_HDRS} ${LIBRARY_WIN32_XTRAS} )
add_library(fieldml-io ${FIELDML_IO_API_SRCS} ${FIELDML_IO_API_PUBLIC_HDRS} ${FIELDML_IO_API_PRIVATE_HDRS} ${LIBRARY_WIN32_XTRAS} )
target_link_libraries(fieldml-io PUBLIC fieldml-core)
target_include_directories(fieldml-io PUBLIC
$<BUILD_INTERFACE:${fieldml_SOURCE_DIR}/core/src>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
Expand Down Expand Up @@ -101,7 +102,7 @@ endif()

# Install targets
if(WIN32 AND BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(fieldml PROPERTIES IMPORT_SUFFIX _dll.lib)
SET_TARGET_PROPERTIES(fieldml-io PROPERTIES IMPORT_SUFFIX _dll.lib)
endif()

INSTALL(TARGETS fieldml-io
Expand Down