Forgot to adjust subdirectory CMakeLists.txt to new variables