diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba51d6868f3b49124e441925244e37a078d2f839..22d3d9e6b151a65543ec5a3264259713374f00e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,8 +219,9 @@ MACRO(print_conf_summary)
     IF(CMAKE_PREFIX_PATH)
         MESSAGE(STATUS "CMake Prefix Path:             ${CMAKE_PREFIX_PATH}")
     ENDIF()
+    MESSAGE(STATUS "CMAKE_C_COMPILER_ID:    ${CMAKE_C_COMPILER_ID}")
     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 "CMAKE_C_COMPILER:     ${CMAKE_C_COMPILER}")
     MESSAGE(STATUS "CMAKE_C_FLAGS:        ${CMAKE_C_FLAGS}")
diff --git a/ParLib.src/CMakeLists.txt b/ParLib.src/CMakeLists.txt
index d7842f4e685bd0879b3df8981c757be4a5cf0a9b..289767f75e68ac35ed7f2fbf1063381f71ac9b7d 100644
--- a/ParLib.src/CMakeLists.txt
+++ b/ParLib.src/CMakeLists.txt
@@ -1,11 +1,14 @@
 
-add_library(plutils STATIC plutils/plutils.c plutils/plutils.h)
+add_library(plutils STATIC "")
 INCLUDE(plutils/CMakeLists.txt)
 if(BUILD_SHARED_LIBS)
-    add_library(parlibc-shared SHARED
+    add_library(parlibc-shared SHARED "")
+    target_sources(parlibc-shared
+            PRIVATE
             parlib.c
             bexchange.c
             transpose.c
+            PUBLIC
             parlib.h)
 
     target_include_directories(parlibc-shared
@@ -32,11 +35,14 @@ endif(BUILD_SHARED_LIBS)
 
 if(BUILD_STATIC_LIBS)
 
-add_library(parlibc-static STATIC
-        parlib.c
-        bexchange.c
-        transpose.c
-        parlib.h)
+add_library(parlibc-static STATIC "")
+    target_sources(parlibc-static
+            PRIVATE
+            parlib.c
+            bexchange.c
+            transpose.c
+            PUBLIC
+            parlib.h)
 set_target_properties(parlibc-static
         PROPERTIES
         POSITION_INDEPENDENT_CODE 1
@@ -70,11 +76,14 @@ if(BUILD_STATIC_LIBS)
     FortranCInterface_HEADER(${CMAKE_CURRENT_SOURCE_DIR}/FC.h MACRO_NAMESPACE "FC_")
     message(STATUS "FORTRAN_C_INTEFACE TEST:    ${FortranCInterface_VERIFIED_C}")
     add_definitions(-DFC_MANGLE=1)
-    add_library(parlibf-static STATIC
+    add_library(parlibf-static STATIC "")
+    target_sources( parlibf-static
+            PRIVATE
             parlibf.c
             bexchangef.c
             transposef.c
             FC.h
+            PUBLIC
             parlibf.h)
 
     target_link_libraries(parlibf-static
@@ -96,11 +105,14 @@ if(BUILD_STATIC_LIBS)
             )
 endif(BUILD_STATIC_LIBS)
     if(BUILD_SHARED_LIBS)
-    add_library(parlibf-shared SHARED
+    add_library(parlibf-shared SHARED "")
+    target_sources(parlibf-shared
+            PRIVATE
             parlibf.c
             bexchangef.c
             transposef.c
             FC.h
+            PUBLIC
             parlibf.h)
 
     target_link_libraries(parlibf-shared
diff --git a/ParLib.src/plutils/CMakeLists.txt b/ParLib.src/plutils/CMakeLists.txt
index 107ec597712042162f9faea717ed6fea2235dd7e..0fc8a32acf1a9fb2911f87d7ea4ff04a3bee89ea 100644
--- a/ParLib.src/plutils/CMakeLists.txt
+++ b/ParLib.src/plutils/CMakeLists.txt
@@ -1,8 +1,8 @@
-#target_sources(plutils
-#        PUBLIC
-#        ${CMAKE_CURRENT_LIST_DIR}/plutils.c
-#        PRIVATE
-#        ${CMAKE_CURRENT_LIST_DIR}/plutils.h
-#        )
+target_sources(plutils
+        PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}/plutils.c
+        PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}/plutils.h
+       )
 include_directories(plutils
         PUBLIC ${CMAKE_CURRENT_LIST_DIR})
\ No newline at end of file