diff --git a/samples/simple/pdegen/CMakeLists.txt b/samples/simple/pdegen/CMakeLists.txt
index fccd6314..33d1b6d1 100644
--- a/samples/simple/pdegen/CMakeLists.txt
+++ b/samples/simple/pdegen/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.15)
 project(AMGExamples Fortran)
 
 # Installation directories (passed as CMake variables)
-set(AMG_INSTALL_DIR "" CACHE PATH "Path to AMG installation")
+set(AMG4PSBLAS_INSTALL_DIR "" CACHE PATH "Path to AMG installation")
 set(PSBLAS_INSTALL_DIR "" CACHE PATH "Path to PSBLAS installation")
 
 # Check if installation directories are set
-if(NOT AMG_INSTALL_DIR)
+if(NOT AMG4PSBLAS_INSTALL_DIR)
     message(FATAL_ERROR "AMG_INSTALL_DIR must be set.  Use -DAMG_INSTALL_DIR=/path/to/amg when running CMake.")
 endif()
 
@@ -14,11 +14,16 @@ if(NOT PSBLAS_INSTALL_DIR)
     message(FATAL_ERROR "PSBLAS_INSTALL_DIR must be set.  Use -DPSBLAS_INSTALL_DIR=/path/to/psblas when running CMake.")
 endif()
 
+
+find_package(psblas REQUIRED PATHS ${PSBLAS_INSTALL_DIR})
+find_package(amg4psblas REQUIRED PATHS ${AMG4PSBLAS_INSTALL_DIR})
+
+
 # Include directories
 include_directories(
     "."
-    "${AMG_INSTALL_DIR}/include"
-    "${AMG_INSTALL_DIR}/modules"
+    "${AMG4PSBLAS_INSTALL_DIR}/include"
+    "${AMG4PSBLAS_INSTALL_DIR}/modules"
     "${PSBLAS_INSTALL_DIR}/include" 
 )
 
@@ -28,23 +33,27 @@ set(FMFLAG "-I")
 
 # Library directories
 link_directories(
-    "${AMG_INSTALL_DIR}/lib"
+    "${AMG4PSBLAS_INSTALL_DIR}/lib"
     "${PSBLAS_INSTALL_DIR}/lib"
 )
 
 # Libraries
-set(AMG_LIBS psb_linsolve amg_prec psb_prec)
-set(PSBLAS_LIBS psb_util psb_linsolve psb_prec psb_base) # Example, adjust as needed
+set(AMG_LIBS amg4psblas::amgprec)
+set(PSBLAS_LIBS  psblas::util psblas::linsolve psblas::prec psblas::base) 
 
 # Executable directory
 set(EXEDIR "${CMAKE_CURRENT_BINARY_DIR}/runs")
 file(MAKE_DIRECTORY "${EXEDIR}")
 
+set(COMMON_SOURCE data_input.f90)
+
+
 # Source files
-set(DMOBJS amg_dexample_ml.f90 data_input.f90 amg_dpde_mod.f90)
-set(D1OBJS amg_dexample_1lev.f90 data_input.f90 amg_dpde_mod.f90)
-set(SMOBJS amg_sexample_ml.f90 data_input.f90 amg_spde_mod.f90)
-set(S1OBJS amg_sexample_1lev.f90 data_input.f90 amg_spde_mod.f90)
+set(DMOBJS ${COMMON_SOURCE} amg_dexample_ml.f90 amg_dpde_mod.f90)
+set(D1OBJS ${COMMON_SOURCE} amg_dexample_1lev.f90 amg_dpde_mod.f90)
+set(SMOBJS ${COMMON_SOURCE} amg_sexample_ml.f90 amg_spde_mod.f90)
+set(S1OBJS ${COMMON_SOURCE} amg_sexample_1lev.f90 amg_spde_mod.f90)
+
 
 # Function to create executable
 macro(create_amg_executable target sources)
@@ -56,11 +65,13 @@ macro(create_amg_executable target sources)
     )
 
     # Move executable to EXEDIR (post-build)
-    add_custom_command(TARGET ${target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E move $<TARGET_FILE:${target}> ${EXEDIR}
-    )
+    #add_custom_command(TARGET ${target} POST_BUILD
+    #    COMMAND ${CMAKE_COMMAND} -E move $<TARGET_FILE:${target}> ${EXEDIR}
+    #)
+    set_target_properties(${target} PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY ${EXEDIR}
+        )
 endmacro()
-
 # Create executables
 create_amg_executable(amg_dexample_ml ${DMOBJS})
 create_amg_executable(amg_dexample_1lev ${D1OBJS})