diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc30af2..bba1c35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,21 +75,21 @@ add_custom_command(
   WORKING_DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
   COMMAND
-    cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
+    ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
   COMMAND
-    cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
+    ${CMAKE_COMMAND} -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
   COMMAND
     ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
   COMMAND
-    cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
+    ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
   COMMAND
-    cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
+    ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
   COMMAND
-    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
+    ${CMAKE_COMMAND} -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
   COMMAND
-    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
+    ${CMAKE_COMMAND} -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
   COMMAND
-    cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
+    ${CMAKE_COMMAND} -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
   COMMENT
     "Generating hourglass API bindings and implementation stub"
   DEPENDS
@@ -167,9 +167,6 @@ if (UNIX OR MINGW)
   # Uncomment the following to put the version info into the .so-file.
   set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${LIB3MF_VERSION_MAJOR}.${LIB3MF_VERSION_MINOR}.${LIB3MF_VERSION_MICRO}.${BUILD_NUMBER}")
   set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION "${LIB3MF_VERSION_MAJOR}")
-  if (NOT APPLE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS -s)
-  endif()
 else()
   # wd4996 masks the deprecated-warning
   target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:/Od;/Ob0;/sdl;/W3;/WX;/FC;/wd4996>")
@@ -182,6 +179,9 @@ install(TARGETS ${PROJECT_NAME}
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
+configure_file(lib3MF.pc.in lib3MF.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/lib3MF.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
 #########################################################
 option(LIB3MF_TESTS "Switch whether the tests of lib3mf should be build" ON)
 message("LIB3MF_TESTS ... " ${LIB3MF_TESTS})
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index de62d3a..0ae693b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1,10 +1,5 @@
-ADD_SUBDIRECTORY (googletest EXCLUDE_FROM_ALL)
 enable_testing()
 
-SET_TARGET_PROPERTIES (gtest PROPERTIES FOLDER gtest)
-SET_TARGET_PROPERTIES (gtest_main PROPERTIES FOLDER gtest)
-
-SET(gtest_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest")
 add_definitions( -DTESTFILESPATH="${CMAKE_CURRENT_SOURCE_DIR}/TestFiles/")
 add_definitions( -DLTESTFILESPATH=L"${CMAKE_CURRENT_SOURCE_DIR}/TestFiles/")
 add_definitions( -DLOUTFILESPATH=L"${CMAKE_BINARY_DIR}/")