Skip to content
Snippets Groups Projects
Commit bb8a56e9 authored by Debolskiy Andrey's avatar Debolskiy Andrey :bicyclist_tone5:
Browse files

reverted changes regarding target_sources

parent 19c52e11
Branches
Tags cmake_build
No related merge requests found
...@@ -219,8 +219,9 @@ MACRO(print_conf_summary) ...@@ -219,8 +219,9 @@ MACRO(print_conf_summary)
IF(CMAKE_PREFIX_PATH) IF(CMAKE_PREFIX_PATH)
MESSAGE(STATUS "CMake Prefix Path: ${CMAKE_PREFIX_PATH}") MESSAGE(STATUS "CMake Prefix Path: ${CMAKE_PREFIX_PATH}")
ENDIF() ENDIF()
MESSAGE(STATUS "CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}")
MESSAGE(STATUS "CMAKE_LIB_DIR: ${INSTALL_LIBDIR}") MESSAGE(STATUS "CMAKE_LIB_DIR: ${INSTALL_LIBDIR}")
MESSAGE(STATUS "CMAKE_LIB_DIR: ${INSTALL_INCLUDEDIR}") MESSAGE(STATUS "CMAKE_INCLUDE_DIR: ${INSTALL_INCLUDEDIR}")
MESSAGE(STATUS "Build Type: ${CMAKE_BUILD_TYPE}") MESSAGE(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
MESSAGE(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}") MESSAGE(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}") MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
......
add_library(plutils STATIC plutils/plutils.c plutils/plutils.h) add_library(plutils STATIC "")
INCLUDE(plutils/CMakeLists.txt) INCLUDE(plutils/CMakeLists.txt)
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
add_library(parlibc-shared SHARED add_library(parlibc-shared SHARED "")
target_sources(parlibc-shared
PRIVATE
parlib.c parlib.c
bexchange.c bexchange.c
transpose.c transpose.c
PUBLIC
parlib.h) parlib.h)
target_include_directories(parlibc-shared target_include_directories(parlibc-shared
...@@ -32,11 +35,14 @@ endif(BUILD_SHARED_LIBS) ...@@ -32,11 +35,14 @@ endif(BUILD_SHARED_LIBS)
if(BUILD_STATIC_LIBS) if(BUILD_STATIC_LIBS)
add_library(parlibc-static STATIC add_library(parlibc-static STATIC "")
parlib.c target_sources(parlibc-static
bexchange.c PRIVATE
transpose.c parlib.c
parlib.h) bexchange.c
transpose.c
PUBLIC
parlib.h)
set_target_properties(parlibc-static set_target_properties(parlibc-static
PROPERTIES PROPERTIES
POSITION_INDEPENDENT_CODE 1 POSITION_INDEPENDENT_CODE 1
...@@ -70,11 +76,14 @@ if(BUILD_STATIC_LIBS) ...@@ -70,11 +76,14 @@ if(BUILD_STATIC_LIBS)
FortranCInterface_HEADER(${CMAKE_CURRENT_SOURCE_DIR}/FC.h MACRO_NAMESPACE "FC_") FortranCInterface_HEADER(${CMAKE_CURRENT_SOURCE_DIR}/FC.h MACRO_NAMESPACE "FC_")
message(STATUS "FORTRAN_C_INTEFACE TEST: ${FortranCInterface_VERIFIED_C}") message(STATUS "FORTRAN_C_INTEFACE TEST: ${FortranCInterface_VERIFIED_C}")
add_definitions(-DFC_MANGLE=1) add_definitions(-DFC_MANGLE=1)
add_library(parlibf-static STATIC add_library(parlibf-static STATIC "")
target_sources( parlibf-static
PRIVATE
parlibf.c parlibf.c
bexchangef.c bexchangef.c
transposef.c transposef.c
FC.h FC.h
PUBLIC
parlibf.h) parlibf.h)
target_link_libraries(parlibf-static target_link_libraries(parlibf-static
...@@ -96,11 +105,14 @@ if(BUILD_STATIC_LIBS) ...@@ -96,11 +105,14 @@ if(BUILD_STATIC_LIBS)
) )
endif(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS)
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
add_library(parlibf-shared SHARED add_library(parlibf-shared SHARED "")
target_sources(parlibf-shared
PRIVATE
parlibf.c parlibf.c
bexchangef.c bexchangef.c
transposef.c transposef.c
FC.h FC.h
PUBLIC
parlibf.h) parlibf.h)
target_link_libraries(parlibf-shared target_link_libraries(parlibf-shared
......
#target_sources(plutils target_sources(plutils
# PUBLIC PRIVATE
# ${CMAKE_CURRENT_LIST_DIR}/plutils.c ${CMAKE_CURRENT_LIST_DIR}/plutils.c
# PRIVATE PUBLIC
# ${CMAKE_CURRENT_LIST_DIR}/plutils.h ${CMAKE_CURRENT_LIST_DIR}/plutils.h
# ) )
include_directories(plutils include_directories(plutils
PUBLIC ${CMAKE_CURRENT_LIST_DIR}) PUBLIC ${CMAKE_CURRENT_LIST_DIR})
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment