diff --git a/Doc/man/CMakeLists.txt b/Doc/man/CMakeLists.txt
index a13c40f7302c861816007fe178db2c77dac66c81..269712444d001e9a22158b3ffc8b0c84c4034032 100644
--- a/Doc/man/CMakeLists.txt
+++ b/Doc/man/CMakeLists.txt
@@ -1,13 +1,13 @@
-set(AUTO_DIR "${CMAKE_SOURCE_DIR}/auto/Doc/man")
+set(AUTO_DIR ${CMAKE_SOURCE_DIR}/auto/Doc/man)
 file(MAKE_DIRECTORY ${AUTO_DIR})
 
 add_custom_target(
     man ALL
-    DEPENDS "${AUTO_DIR}/bornagain.1"
+    DEPENDS ${AUTO_DIR}/bornagain.1
 )
 
 add_custom_command(
-    OUTPUT "${AUTO_DIR}/bornagain.1"
+    OUTPUT ${AUTO_DIR}/bornagain.1
     COMMAND ${POD2MAN} -s 1 -c "BornAgain manual" ${CMAKE_CURRENT_SOURCE_DIR}/bornagain.pod ${AUTO_DIR}/bornagain.1
     DEPENDS bornagain.pod
 )
diff --git a/Tests/Performance/Core/CMakeLists.txt b/Tests/Performance/Core/CMakeLists.txt
index 3bbd47f3fae3d2b66562ce2039313b70cb8f73ea..ce7f460676014495c892903b5e25f39f31d87cf5 100644
--- a/Tests/Performance/Core/CMakeLists.txt
+++ b/Tests/Performance/Core/CMakeLists.txt
@@ -1,5 +1,5 @@
 function(PerformanceTest NAME SPEED DEPS)
-    set(TEST "PTest${NAME}")
+    set(TEST PTest${NAME})
     add_executable(${TEST} ${NAME}.cpp ${DEPS})
     target_link_libraries(${TEST} BornAgainCore)
     if((${SPEED} STREQUAL "fast") OR SLOWTESTS)
diff --git a/cmake/BornAgain/LineLength.cmake b/cmake/BornAgain/LineLength.cmake
index b780a398dde704a731bacf52945c4a4eaf16e20c..311637cedbd93d009f65c27dcf393e8ff2228970 100644
--- a/cmake/BornAgain/LineLength.cmake
+++ b/cmake/BornAgain/LineLength.cmake
@@ -9,18 +9,18 @@ if(NOT MSVC)
     foreach(dir ${AllComponents})
         file(GLOB_RECURSE src1 ${dir}/*.cpp)
         file(GLOB_RECURSE src2 ${dir}/*.h)
-        add_test(NAME "LineLength.Cpp.${dir}"
+        add_test(NAME LineLength.Cpp.${dir}
             COMMAND ${LINECOUNT} ${SRC_LEN_LIM} ${src1} ${src2})
     endforeach()
 
     foreach(dir ${AllComponents})
         file(GLOB_RECURSE src1 ${dir}/*CMakeLists.txt)
-        add_test(NAME "LineLength.CMake.${dir}"
+        add_test(NAME LineLength.CMake.${dir}
             COMMAND ${LINECOUNT} ${SRC_LEN_LIM} ${src1})
     endforeach()
 
     file(GLOB_RECURSE sources ${PY_EXAMPLES_DIR}/*.py)
-    add_test(NAME "LineLength.PyExamples"
+    add_test(NAME LineLength.PyExamples
         COMMAND ${LINECOUNT} ${WEB_LEN_LIM} ${sources})
 
 endif()
diff --git a/cmake/BornAgain/Pack.cmake b/cmake/BornAgain/Pack.cmake
index 1970a78bd0e9cac4554ef895befad5148100d72f..44b5096093ed67fcca98cccb19d6a17055d3051f 100644
--- a/cmake/BornAgain/Pack.cmake
+++ b/cmake/BornAgain/Pack.cmake
@@ -38,39 +38,38 @@ message(STATUS "Source package name: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
 # Specify which files not to include into the source package generated by make package_source
 set(CPACK_SOURCE_IGNORE_FILES
     ${CPACK_SOURCE_IGNORE_FILES} # first take the default parameters
-    "/Doc/FFCatalog/"
-    "/Doc/PhysicsManual/"
-    "/devtools/edit-scripts/"
-    "/devtools/packaging/"
-    "/devtools/tmp-examples/"
-    "/devtools/tmp-unsorted/"
-    "/XCode_BornAgain.xcodeproj/"
-    "~$"
-    "/.git/"
-    "/\\\\.git/"
-    "/\\\\\\\\.git/"  # more screeneng symbols is neccesary because of double file processing by cmake and cpack
-    "\\\\\\\\.swp$"
-    "\\\\.swp$"
-    "/.metadata/"
-    "/.settings/"
-    "\\\\.cproject"
-    "\\\\.project"
-    "/\\\\.idea/"
-    "\\\\.lssrc"
-    "\\\\.gitignore"
-    "\\\\.DS_Store"
-    "\\\\.obj"
-    "CMakeLists.txt.user"
-    "/bin/release.sh.in" # user will not need it
-    "/devtools/git-utils/cl_lines_of_code.py"
-    "/devtools/git-utils/qqq.png" # remove this line when unneeded
-    ".pro$"
-    ".pro.user$"
-    ".pri$"
-    "build/"
+    /Doc/FFCatalog/
+    /Doc/PhysicsManual/
+    /devtools/edit-scripts/
+    /devtools/packaging/
+    /devtools/tmp-examples/
+    /devtools/tmp-unsorted/
+    /XCode_BornAgain.xcodeproj/
+    ~$
+    /.git/
+    /\\\\.git/
+    /\\\\\\\\.git/  # more screeneng symbols is neccesary because of double file processing by cmake and cpack
+    \\\\\\\\.swp$
+    \\\\.swp$
+    /.metadata/
+    /.settings/
+    \\\\.cproject
+    \\\\.project
+    /\\\\.idea/
+    \\\\.lssrc
+    \\\\.gitignore
+    \\\\.DS_Store
+    \\\\.obj
+    CMakeLists.txt.user
+    /bin/release.sh.in # user will not need it
+    /devtools/git-utils/cl_lines_of_code.py
+    /devtools/git-utils/qqq.png # remove this line when unneeded
+    .pro$
+    .pro.user$
+    .pri$
+    build/
 )
 
-
 include(CPack)
 
 set(CPACK_COMPONENTS_ALL Libraries Headers Examples)