diff --git a/CMakeLists.txt b/CMakeLists.txt
index b51e1c69..17ecd971 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ find_package(LibXml2 REQUIRED)
 if (try_OpenMP)
   find_package(OpenMP)
   if (OpenMP_FOUND)
-#    add_definitions(-DHAVE_GOMP)
+    add_definitions(-DHAVE_GOMP)
     set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP")
   endif (OpenMP_FOUND)
 endif (try_OpenMP)
diff --git a/cmake/config.h.in b/cmake/config.h.in
index 501ffa4b..03763f76 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -1,5 +1,7 @@
 // config.h
 
+#define PACKAGE_VERSION "@PROJECT_VERSION@"
+
 // define to 1 if you have <alloca.h> and it should be used 
 #cmakedefine HAVE_ALLOCA_H 1
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6fd6218..73276a6e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,19 +47,23 @@ add_custom_target(
 
 #--- add all executables ------------------------------------------------------
 add_executable(any2many git-revision.h any2many.cpp)
+target_compile_options(any2many BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(any2many 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
 target_link_libraries(any2many ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(dump_header git-revision.h dump_header.cpp)
+target_compile_options(dump_header BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(dump_header 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MusrRoot>
@@ -71,9 +75,11 @@ target_include_directories(dump_header
 target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(msr2data git-revision.h msr2data.cpp)
+target_compile_options(msr2data BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(msr2data 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
@@ -83,27 +89,33 @@ add_executable(msr2msr msr2msr.cpp)
 target_link_libraries(msr2msr ${ROOT_LIBRARIES})
 
 add_executable(musrfit git-revision.h musrfit.cpp)
+target_compile_options(musrfit BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrfit 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
 target_link_libraries(musrfit ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(musrFT git-revision.h musrFT.cpp)
+target_compile_options(musrFT BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrFT 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
 target_link_libraries(musrFT  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(musrRootValidation git-revision.h musrRootValidation.cpp)
+target_compile_options(musrRootValidation BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrRootValidation 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
     $<BUILD_INTERFACE:${LIBXML2_INCLUDE_DIR}>
@@ -111,27 +123,33 @@ target_include_directories(musrRootValidation
 target_link_libraries(musrRootValidation ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
 
 add_executable(musrt0 git-revision.h musrt0.cpp)
+target_compile_options(musrt0 BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrt0 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
 target_link_libraries(musrt0 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(musrview git-revision.h musrview.cpp)
+target_compile_options(musrview BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(musrview 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
 )
 target_link_libraries(musrview  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
 
 add_executable(write_musrRoot_runHeader git-revision.h write_musrRoot_runHeader.cpp)
+target_compile_options(write_musrRoot_runHeader BEFORE PRIVATE "-DHAVE_CONFIG_H")
 target_include_directories(write_musrRoot_runHeader 
   BEFORE PRIVATE
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
     $<BUILD_INTERFACE:${LIBXML2_INCLUDE_DIR}>