diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65dbe63..b2bf4ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,11 +48,12 @@ include_directories(
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -fpic -Wextra -Wshadow")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FALGS} -g")
-set(CMAKE_EXE_LINKER_FLAGS "-lpcre")
 
-set(SOURCE_FILES fish_shell/main.c fish_shell/fish_types.h fish_shell/fish_core.h fish_shell/fish_core.c fish_shell/fish_commands.c fish_shell/fish_commands.h fish_shell/fish_globbing.c fish_shell/fish_globbing.h fish_shell/fish_utils.c fish_shell/fish_utils.h fish_settings.c fish_settings.h)
+set(SOURCE_FILES fish_shell/main.c fish_shell/fish_types.h fish_shell/fish_core.h fish_shell/fish_core.c fish_shell/fish_commands.c fish_shell/fish_commands.h fish_shell/fish_globbing.c fish_shell/fish_globbing.h fish_shell/fish_utils.c fish_shell/fish_utils.h fish_shell/fish_settings.c fish_shell/fish_settings.h)
 add_executable(fish ${SOURCE_FILES})
 
+target_link_libraries(fish pcre)
+
 #add_subdirectory(fish_shell)
 
 add_subdirectory(fish_shell_tests)
diff --git a/fish_shell_tests/CMakeLists.txt b/fish_shell_tests/CMakeLists.txt
index a670066..34532df 100644
--- a/fish_shell_tests/CMakeLists.txt
+++ b/fish_shell_tests/CMakeLists.txt
@@ -11,9 +11,9 @@ include_directories(
         "${source_dir}/googlemock/include"
 )
 
-set(SOURCE_FILES_TESTS main.cpp FishCoreTests.cpp FishUtilsTests.cpp FishSettings.cpp )
+set(SOURCE_FILES_TESTS main.cpp FishCoreTests.cpp FishUtilsTests.cpp FishSettingsTests.cpp )
 
 add_executable(fish_tests ${SOURCE_FILES_TESTS})
 
-target_link_libraries(fish_tests libgtest libgmock)
+target_link_libraries(fish_tests libgtest libgmock pcre)