diff --git a/buildtools/gt.cmake b/buildtools/gt.cmake
index 02fc2762e..36a375f0a 100644
--- a/buildtools/gt.cmake
+++ b/buildtools/gt.cmake
@@ -107,9 +107,9 @@ function(GT_MAIN_SOURCES)
     gt_main_sources_helper(${ARGN})
     set(GT_COMMON_SOURCES "${GT_COMMON_SOURCES}" PARENT_SCOPE)
     # Build a "convenience" static library
-    add_library(${PROJECT_NAME}-static STATIC ${GT_COMMON_SOURCES})
-    SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
-    SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    #add_library(${PROJECT_NAME}-static STATIC ${GT_COMMON_SOURCES})
+    #SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+    #SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 endfunction(GT_MAIN_SOURCES)
 function(GT_MAIN_SOURCES_HELPER)
     set(GT_COMMON_SOURCES "")
@@ -151,7 +151,7 @@ function(GT_MAIN_LIB)
     #SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
     SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
     #SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}-static LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib")
+    install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib")
 endfunction(GT_MAIN_LIB)
 
 # Define the main static library from the given sources
@@ -159,6 +159,9 @@ function(GT_MAIN_STLIB)
     gt_main_sources(${ARGN})
     set(GT_COMMON_SOURCES "${GT_COMMON_SOURCES}" PARENT_SCOPE)
     message(STATUS "[gt.cmake] Adding main stlib \"${PROJECT_NAME}\" with sources ${GT_COMMON_SOURCES}")
+    add_library(${PROJECT_NAME}-static STATIC ${GT_COMMON_SOURCES})
+    SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+    SET_TARGET_PROPERTIES(${PROJECT_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
     #add_library(${PROJECT_NAME} STATIC ${GT_COMMON_SOURCES})
     install(TARGETS ${PROJECT_NAME}-static ARCHIVE DESTINATION "lib")
 endfunction(GT_MAIN_STLIB)
@@ -195,9 +198,7 @@ function(GT_AUTO_EXES)
             gt_get_stem(exe ${src})
             message(STATUS "[gt.cmake] Adding auto exe \"${exe}\" from ${src}")
             add_executable(${exe} ${src})
-            if(TARGET ${PROJECT_NAME}-static)
-                target_link_libraries(${exe} ${PROJECT_NAME}-static)
-            endif(TARGET ${PROJECT_NAME}-static)
+            target_link_libraries(${exe} ${PROJECT_NAME})
         endforeach(src ${srcs})
     endforeach(srcpat ${ARGN})
 endfunction(GT_AUTO_EXES)
@@ -211,9 +212,7 @@ function(GT_AUTO_INSTALLED_EXES)
             gt_get_stem(exe ${src})
             message(STATUS "[gt.cmake] Adding auto installed exe \"${exe}\" from ${src}")
             add_executable(${exe} ${src})
-            if(TARGET ${PROJECT_NAME}-static)
-                target_link_libraries(${exe} ${PROJECT_NAME}-static)
-            endif(TARGET ${PROJECT_NAME}-static)
+            target_link_libraries(${exe} ${PROJECT_NAME})
             install(TARGETS ${exe} RUNTIME DESTINATION "bin")
         endforeach(src ${srcs})
     endforeach(srcpat ${ARGN})
@@ -238,9 +237,7 @@ function(GT_AUTO_TESTS)
             message(STATUS "[gt.cmake] Adding test \"${exe}\" from ${src}")
             add_executable(${exe} ${src})
             target_link_libraries(${exe} "CppUnitLite")
-            if(TARGET ${PROJECT_NAME}-static)
-                target_link_libraries(${exe} ${PROJECT_NAME}-static)
-            endif(TARGET ${PROJECT_NAME}-static)
+            target_link_libraries(${exe} ${PROJECT_NAME})
             add_test(${exe} ${exe})
         endforeach(src ${srcs})
     endforeach(srcpat ${ARGN})